Changeset 195533 in webkit


Ignore:
Timestamp:
Jan 25, 2016 6:06:53 AM (8 years ago)
Author:
youenn.fablet@crf.canon.fr
Message:

WebCoreJSBuiltins do not use to do conditional include
​https://bugs.webkit.org/show_bug.cgi?id=153306

Reviewed by Alex Christensen.

Removing compilation guards as builtin generator adds them in the files themselves.
Fixing MediaDevices.js to generate MEDIA_STREAM compilation guard.

No change in behavior.

  • Modules/mediastream/MediaDevices.js: Changing @optional to @conditional.
  • bindings/js/WebCoreJSBuiltins.cpp:
  • bindings/js/WebCoreJSBuiltins.h:
Location:
trunk/Source/WebCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r195532 r195533  
     12016-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
    1172016-01-25  Commit Queue  <commit-queue@webkit.org>
    218

  • trunk/Source/WebCore/Modules/mediastream/MediaDevices.js

    r191287 r195533  
    2727 */
    2828
    29 // @optional=MEDIA_STREAM
     29// @conditional=ENABLE(MEDIA_STREAM)
    3030
    3131function getUserMedia(options)

  • trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp

    r195532 r195533  
    2727#include "config.h"
    2828
    29 #if ENABLE(FETCH_API)
     29#include "ByteLengthQueuingStrategyBuiltins.cpp"
     30#include "CountQueuingStrategyBuiltins.cpp"
    3031#include "FetchHeadersBuiltins.cpp"
    31 #endif
    32 
    33 #if ENABLE(MEDIA_STREAM)
    3432#include "MediaDevicesBuiltins.cpp"
    3533#include "NavigatorUserMediaBuiltins.cpp"
    3634#include "RTCPeerConnectionBuiltins.cpp"
    3735#include "RTCPeerConnectionInternalsBuiltins.cpp"
    38 #endif
    39 
    40 #if ENABLE(STREAMS_API)
    41 #include "ByteLengthQueuingStrategyBuiltins.cpp"
    42 #include "CountQueuingStrategyBuiltins.cpp"
    4336#include "ReadableStreamBuiltins.cpp"
    4437#include "ReadableStreamControllerBuiltins.cpp"
    … …  
    4841#include "WritableStreamBuiltins.cpp"
    4942#include "WritableStreamInternalsBuiltins.cpp"
    50 #endif

  • trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h

    r195532 r195533  
    2828#define WebCoreJSBuiltins_h
    2929
    30 #if ENABLE(FETCH_API)
     30#include "ByteLengthQueuingStrategyBuiltins.h"
     31#include "CountQueuingStrategyBuiltins.h"
    3132#include "FetchHeadersBuiltins.h"
    32 #endif
    33 
    34 #if ENABLE(MEDIA_STREAM)
    3533#include "MediaDevicesBuiltins.h"
    3634#include "NavigatorUserMediaBuiltins.h"
    3735#include "RTCPeerConnectionBuiltins.h"
    3836#include "RTCPeerConnectionInternalsBuiltins.h"
    39 #endif
    40 
    41 #if ENABLE(STREAMS_API)
    42 #include "ByteLengthQueuingStrategyBuiltins.h"
    43 #include "CountQueuingStrategyBuiltins.h"
    4437#include "ReadableStreamBuiltins.h"
    4538#include "ReadableStreamControllerBuiltins.h"
    … …  
    4942#include "WritableStreamBuiltins.h"
    5043#include "WritableStreamInternalsBuiltins.h"
    51 #endif
    52 
    5344#include <runtime/VM.h>
    5445
Note: See TracChangeset for help on using the changeset viewer.