Changeset 195533 in webkit
- Timestamp:
- Jan 25, 2016 6:06:53 AM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r195532 r195533 1 2016-01-25 Youenn Fablet <youenn.fablet@crf.canon.fr> 2 3 WebCoreJSBuiltins do not use to do conditional include 4 https://bugs.webkit.org/show_bug.cgi?id=153306 5 6 Reviewed by Alex Christensen. 7 8 Removing compilation guards as builtin generator adds them in the files themselves. 9 Fixing MediaDevices.js to generate MEDIA_STREAM compilation guard. 10 11 No change in behavior. 12 13 * Modules/mediastream/MediaDevices.js: Changing @optional to @conditional. 14 * bindings/js/WebCoreJSBuiltins.cpp: 15 * bindings/js/WebCoreJSBuiltins.h: 16 1 17 2016-01-25 Commit Queue <commit-queue@webkit.org> 2 18 -
trunk/Source/WebCore/Modules/mediastream/MediaDevices.js
r191287 r195533 27 27 */ 28 28 29 // @ optional=MEDIA_STREAM29 // @conditional=ENABLE(MEDIA_STREAM) 30 30 31 31 function getUserMedia(options) -
trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp
r195532 r195533 27 27 #include "config.h" 28 28 29 #if ENABLE(FETCH_API) 29 #include "ByteLengthQueuingStrategyBuiltins.cpp" 30 #include "CountQueuingStrategyBuiltins.cpp" 30 31 #include "FetchHeadersBuiltins.cpp" 31 #endif32 33 #if ENABLE(MEDIA_STREAM)34 32 #include "MediaDevicesBuiltins.cpp" 35 33 #include "NavigatorUserMediaBuiltins.cpp" 36 34 #include "RTCPeerConnectionBuiltins.cpp" 37 35 #include "RTCPeerConnectionInternalsBuiltins.cpp" 38 #endif39 40 #if ENABLE(STREAMS_API)41 #include "ByteLengthQueuingStrategyBuiltins.cpp"42 #include "CountQueuingStrategyBuiltins.cpp"43 36 #include "ReadableStreamBuiltins.cpp" 44 37 #include "ReadableStreamControllerBuiltins.cpp" … … 48 41 #include "WritableStreamBuiltins.cpp" 49 42 #include "WritableStreamInternalsBuiltins.cpp" 50 #endif -
trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h
r195532 r195533 28 28 #define WebCoreJSBuiltins_h 29 29 30 #if ENABLE(FETCH_API) 30 #include "ByteLengthQueuingStrategyBuiltins.h" 31 #include "CountQueuingStrategyBuiltins.h" 31 32 #include "FetchHeadersBuiltins.h" 32 #endif33 34 #if ENABLE(MEDIA_STREAM)35 33 #include "MediaDevicesBuiltins.h" 36 34 #include "NavigatorUserMediaBuiltins.h" 37 35 #include "RTCPeerConnectionBuiltins.h" 38 36 #include "RTCPeerConnectionInternalsBuiltins.h" 39 #endif40 41 #if ENABLE(STREAMS_API)42 #include "ByteLengthQueuingStrategyBuiltins.h"43 #include "CountQueuingStrategyBuiltins.h"44 37 #include "ReadableStreamBuiltins.h" 45 38 #include "ReadableStreamControllerBuiltins.h" … … 49 42 #include "WritableStreamBuiltins.h" 50 43 #include "WritableStreamInternalsBuiltins.h" 51 #endif52 53 44 #include <runtime/VM.h> 54 45
Note: See TracChangeset
for help on using the changeset viewer.