Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Side by Side Diff: Source/bindings/core/v8/Dictionary.cpp

Issue 650063002: Move MediaStream and MediaStreamTrack implementation from modules/mediastream to core/mediastream. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 16 matching lines...) Expand all
27 #include "bindings/core/v8/Dictionary.h" 27 #include "bindings/core/v8/Dictionary.h"
28 28
29 #include "bindings/core/v8/ArrayValue.h" 29 #include "bindings/core/v8/ArrayValue.h"
30 #include "bindings/core/v8/ExceptionMessages.h" 30 #include "bindings/core/v8/ExceptionMessages.h"
31 #include "bindings/core/v8/ExceptionState.h" 31 #include "bindings/core/v8/ExceptionState.h"
32 #include "bindings/core/v8/V8Binding.h" 32 #include "bindings/core/v8/V8Binding.h"
33 #include "bindings/core/v8/V8DOMError.h" 33 #include "bindings/core/v8/V8DOMError.h"
34 #include "bindings/core/v8/V8Element.h" 34 #include "bindings/core/v8/V8Element.h"
35 #include "bindings/core/v8/V8EventTarget.h" 35 #include "bindings/core/v8/V8EventTarget.h"
36 #include "bindings/core/v8/V8MediaKeyError.h" 36 #include "bindings/core/v8/V8MediaKeyError.h"
37 #include "bindings/core/v8/V8MediaStream.h"
37 #include "bindings/core/v8/V8MessagePort.h" 38 #include "bindings/core/v8/V8MessagePort.h"
38 #include "bindings/core/v8/V8Path2D.h" 39 #include "bindings/core/v8/V8Path2D.h"
39 #include "bindings/core/v8/V8Storage.h" 40 #include "bindings/core/v8/V8Storage.h"
40 #include "bindings/core/v8/V8TextTrack.h" 41 #include "bindings/core/v8/V8TextTrack.h"
41 #include "bindings/core/v8/V8VoidCallback.h" 42 #include "bindings/core/v8/V8VoidCallback.h"
42 #include "bindings/core/v8/V8Window.h" 43 #include "bindings/core/v8/V8Window.h"
43 #include "bindings/core/v8/custom/V8ArrayBufferViewCustom.h" 44 #include "bindings/core/v8/custom/V8ArrayBufferViewCustom.h"
44 #include "bindings/core/v8/custom/V8Uint8ArrayCustom.h" 45 #include "bindings/core/v8/custom/V8Uint8ArrayCustom.h"
45 #include "bindings/modules/v8/V8Gamepad.h" 46 #include "bindings/modules/v8/V8Gamepad.h"
46 #include "bindings/modules/v8/V8Headers.h" 47 #include "bindings/modules/v8/V8Headers.h"
47 #include "bindings/modules/v8/V8IDBKeyRange.h" 48 #include "bindings/modules/v8/V8IDBKeyRange.h"
48 #include "bindings/modules/v8/V8MIDIPort.h" 49 #include "bindings/modules/v8/V8MIDIPort.h"
49 #include "bindings/modules/v8/V8MediaStream.h"
50 #include "bindings/modules/v8/V8SpeechRecognitionResult.h" 50 #include "bindings/modules/v8/V8SpeechRecognitionResult.h"
51 #include "bindings/modules/v8/V8SpeechRecognitionResultList.h" 51 #include "bindings/modules/v8/V8SpeechRecognitionResultList.h"
52 #include "core/html/track/TrackBase.h" 52 #include "core/html/track/TrackBase.h"
53 #include "core/mediastream/MediaStream.h"
53 #include "modules/gamepad/Gamepad.h" 54 #include "modules/gamepad/Gamepad.h"
54 #include "modules/indexeddb/IDBKeyRange.h" 55 #include "modules/indexeddb/IDBKeyRange.h"
55 #include "modules/mediastream/MediaStream.h"
56 #include "modules/speech/SpeechRecognitionResult.h" 56 #include "modules/speech/SpeechRecognitionResult.h"
57 #include "modules/speech/SpeechRecognitionResultList.h" 57 #include "modules/speech/SpeechRecognitionResultList.h"
58 #include "wtf/MathExtras.h" 58 #include "wtf/MathExtras.h"
59 59
60 namespace blink { 60 namespace blink {
61 61
62 Dictionary::Dictionary() 62 Dictionary::Dictionary()
63 : m_isolate(0) 63 : m_isolate(0)
64 { 64 {
65 } 65 }
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 295
296 return *this; 296 return *this;
297 } 297 }
298 298
299 void Dictionary::ConversionContext::throwTypeError(const String& detail) 299 void Dictionary::ConversionContext::throwTypeError(const String& detail)
300 { 300 {
301 exceptionState().throwTypeError(detail); 301 exceptionState().throwTypeError(detail);
302 } 302 }
303 303
304 } // namespace blink 304 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698