Changeset 190723 in webkit


Ignore:
Timestamp:
Oct 8, 2015 8:23:24 AM (9 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r190716.
​https://bugs.webkit.org/show_bug.cgi?id=149924

broke mac build from time to time (Requested by youenn on
#webkit).

Reverted changeset:

"Automate WebCore JS builtins generation and build system"
​https://bugs.webkit.org/show_bug.cgi?id=149751
​http://trac.webkit.org/changeset/190716

Location:
trunk/Source
Files:
1 deleted
18 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r190722 r190723  
     12015-10-08  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r190716.
     4        https://bugs.webkit.org/show_bug.cgi?id=149924
     5
     6        broke mac build from time to time (Requested by youenn on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "Automate WebCore JS builtins generation and build system"
     12        https://bugs.webkit.org/show_bug.cgi?id=149751
     13        http://trac.webkit.org/changeset/190716
     14
    1152015-10-08  Csaba Osztrogonác  <ossy@webkit.org>
    216

  • trunk/Source/JavaScriptCore/generate-js-builtins

    r190716 r190723  
    315315    builtinName = scopeName[0].lower() + scopeName[1:]
    316316    builtinsImplementation.write("""{\\
    317     JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \\
    318     return clientData->builtinFunctions().%s().codeName##Executable()->link(vm, clientData->builtinFunctions().%s().codeName##Source()); \\
     317    WebCoreJSClientData* clientData = static_cast<WebCoreJSClientData*>(vm.clientData); \\
     318    return clientData->%s().codeName##Executable()->link(vm, clientData->%s().codeName##Source()); \\
    319319"""% (builtinName, builtinName))
    320320

  • trunk/Source/WebCore/CMakeLists.txt

    r190716 r190723  
    12431243    bindings/js/ScriptState.cpp
    12441244    bindings/js/SerializedScriptValue.cpp
     1245    bindings/js/WebCoreJSBuiltins.cpp
    12451246    bindings/js/WebCoreTypedArrayController.cpp
    12461247    bindings/js/WorkerScriptController.cpp
    … …  
    35823583    add_custom_command(
    35833584        OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_name}BuiltinsWrapper.h ${DERIVED_SOURCES_WEBCORE_DIR}/${_name}Builtins.h ${DERIVED_SOURCES_WEBCORE_DIR}/${_name}Builtins.cpp
    3584         MAIN_DEPENDENCY ${WEBCORE_DIR}/generate-js-builtins
     3585        MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/generate-js-builtins
    35853586        DEPENDS ${WebCore_GENERATE_JS_BUILTINS_SCRIPTS_DIR}/generate-js-builtins
    35863587        DEPENDS ${_builtinjs}
    … …  
    35933594    ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/bindings/js/WebCoreJSBuiltins.cpp ${_name}Builtins.cpp)
    35943595endforeach ()
    3595 add_custom_command(
    3596     OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.cpp
    3597     MAIN_DEPENDENCY ${WEBCORE_DIR}/generate-js-builtins-allinone
    3598     DEPENDS ${WEBCORE_JS_BUILTINS}
    3599     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate-js-builtins-allinone ${WEBCORE_JS_BUILTINS} --output_dir ${DERIVED_SOURCES_WEBCORE_DIR}
    3600     VERBATIM)
    3601 list(APPEND WebCore_SOURCES
    3602     ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h
    3603     ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h
    3604     ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.cpp
    3605 )
    36063596
    36073597ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)

  • trunk/Source/WebCore/ChangeLog

    r190721 r190723  
     12015-10-08  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r190716.
     4        https://bugs.webkit.org/show_bug.cgi?id=149924
     5
     6        broke mac build from time to time (Requested by youenn on
     7        #webkit).
     8
     9        Reverted changeset:
     10
     11        "Automate WebCore JS builtins generation and build system"
     12        https://bugs.webkit.org/show_bug.cgi?id=149751
     13        http://trac.webkit.org/changeset/190716
     14
    1152015-10-08  Sergio Villar Senin  <svillar@igalia.com>
    216

  • trunk/Source/WebCore/DerivedSources.make

    r190716 r190723  
    12521252# WebCore JS Builtins
    12531253
    1254 WEBCORE_JS_BUILTINS_SOURCE = \
     1254WEBCORE_JS_BUILTINS = \
    12551255    $(WebCore)/Modules/streams/ByteLengthQueuingStrategy.js \
    12561256    $(WebCore)/Modules/streams/CountQueuingStrategy.js \
    … …  
    12611261#
    12621262
    1263 .PHONY: WebCoreJSBuiltins
    1264 WebCoreJSBuiltins: WebCoreJSBuiltins.cpp WebCoreJSBuiltins.h WebCoreJSBuiltinInternals.h
    1265 all : WebCoreJSBuiltins $(WEBCORE_JS_BUILTINS_SOURCE:%.js=%Builtins.h) $(WEBCORE_JS_BUILTINS_SOURCE:%.js=%BuiltinsWrapper.h) $(WEBCORE_JS_BUILTINS_SOURCE:%.js=%Builtins.cpp)
    1266 
    1267 WebCoreJSBuiltins.cpp: WebCoreJSBuiltinInternals.h WebCoreJSBuiltins.h
    1268 WebCoreJSBuiltins.cpp WebCoreJSBuiltins.h WebCoreJSBuiltinInternals.h: $(WEBCORE_JS_BUILTINS_SOURCE) $(WebCore)/generate-js-builtins-allinone
    1269         $(PYTHON) $(WebCore)/generate-js-builtins-allinone $(WEBCORE_JS_BUILTINS_SOURCE)  --output_dir .
    1270 
    1271 %Builtins.cpp: %Builtins.h %BuiltinsWrapper.h
    1272 %Builtins.h %Builtins.cpp %BuiltinsWrapper.h: %.js $(WebCore)/generate-js-builtins
     1263all : $(WEBCORE_JS_BUILTINS:%.js=%Builtins.cpp)
     1264
     1265%Builtins.cpp: %.js
    12731266        $(PYTHON) $(WebCore)/generate-js-builtins --input $< --generate_js_builtins_path $(GenerateJSBuiltinsScripts)
    12741267

  • trunk/Source/WebCore/Modules/streams/ByteLengthQueuingStrategy.js

    r190716 r190723  
    2525 */
    2626
    27 // @optional=STREAMS_API
    28 
    2927function size(chunk)
    3028{

  • trunk/Source/WebCore/Modules/streams/CountQueuingStrategy.js

    r190716 r190723  
    2424 */
    2525
    26 // @optional=STREAMS_API
    27 
    2826function size()
    2927{

  • trunk/Source/WebCore/Modules/streams/ReadableStream.js

    r190716 r190723  
    9898}
    9999
    100 // @optional=STREAMS_API
    101 
    102100function pipeThrough(streams, options)
    103101{

  • trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js

    r190716 r190723  
    7272}
    7373
    74 // @optional=STREAMS_API
    75 // @internals
    76 
    7774function teeReadableStream(stream, shouldClone)
    7875{

  • trunk/Source/WebCore/WebCore.order

    r190716 r190723  
    2472424724__ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_6DOMURLEE13jsDOMURLOwner
    2472524725__ZN7WebCoreL27JSDOMWindowConstructorTableE
    24726 __ZTVN7WebCore19JSVMClientDataE
     24726__ZTVN7WebCore19WebCoreJSClientDataE
    2472724727__ZN7WebCoreL40JSDynamicsCompressorNodeConstructorTableE
    2472824728__ZN7WebCoreL38JSDynamicsCompressorNodePrototypeTableE

  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r190716 r190723  
    232232  </ItemDefinitionGroup>
    233233  <ItemGroup>
    234     <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\WebCoreJSBuiltins.cpp">
    235       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    236       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    237       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
    238       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
    239       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
    240       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
    241       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
    242       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    243       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
    244       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
    245       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
    246       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    247     </ClCompile>
    248234    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\ColorData.cpp" />
    249235    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\CSSGrammar.cpp">
    … …  
    1890318889    </ClCompile>
    1890418890    <ClCompile Include="..\bindings\js\WebCoreTypedArrayController.cpp">
     18891      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     18892      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     18893      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     18894      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
     18895      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
     18896      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
     18897      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     18898      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     18899      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     18900      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
     18901      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     18902      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     18903    </ClCompile>
     18904    <ClCompile Include="..\bindings\js\WebCoreJSBuiltins.cpp">
    1890518905      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
    1890618906      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r190716 r190723  
    14861486                40ECAE8116B8B68A00C36103 /* JSDOMError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40ECAE8016B8B68A00C36103 /* JSDOMError.cpp */; };
    14871487                410B7E721045FAB000D8224F /* JSMessageEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */; };
     1488                411A90421BBAB47A000CF156 /* WebCoreJSBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 411A90411BBAB46D000CF156 /* WebCoreJSBuiltins.cpp */; };
    14881489                4123081B138C429700BCCFCA /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93F19B1A08245E5A001E9ABC /* WebCore.framework */; };
    14891490                41230913138C42FF00BCCFCA /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8216299029F4FB501000131 /* JavaScriptCore.framework */; };
    … …  
    15081509                416E6FE81BBD12DF000A6043 /* ReadableStreamInternalsBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
    15091510                416E6FE91BBD12E5000A6043 /* ReadableStreamBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764D8 /* ReadableStreamBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1510                 416E6FEA1BBD1684000A6044 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1511                 416E6FEA1BBD1684000A6043 /* WebCoreJSBuiltinInternals.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764D9 /* WebCoreJSBuiltinInternals.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1511                416E6FEA1BBD1684000A6043 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764D9 /* ReadableStreamInternalsBuiltinsWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
    15121512                417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417253A81354BBBC00360F2A /* MediaControlElements.cpp */; };
    15131513                417253AB1354BBBC00360F2A /* MediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = 417253A91354BBBC00360F2A /* MediaControlElements.h */; };
    … …  
    26332633                7C48A6D1191C9D6500026674 /* WebKitNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C48A6CF191C9D6500026674 /* WebKitNamespace.h */; };
    26342634                7C4902A218B825F8007D9298 /* DOMWheelEventInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85989DCA0ACC8BBD00A0BC51 /* DOMWheelEventInternal.h */; };
    2635                 7C4C96DC1AD4483500365A51 /* WebCoreJSBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96D81AD4483500365A51 /* WebCoreJSBuiltins.cpp */; };
    26362635                7C4C96DC1AD4483500365A50 /* JSReadableStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */; };
    26372636                7C4C96DD1AD4483500365A50 /* JSReadableStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4C96D91AD4483500365A50 /* JSReadableStream.h */; };
    … …  
    87658764                410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessageEventCustom.cpp; sourceTree = "<group>"; };
    87668765                41189EF71AD8232800B90A0D /* ReadableStreamController.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStreamController.idl; sourceTree = "<group>"; };
     8766                411A90411BBAB46D000CF156 /* WebCoreJSBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreJSBuiltins.cpp; sourceTree = "<group>"; };
    87678767                4127D5360F8AAB1D00E424F5 /* ScriptState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptState.cpp; sourceTree = "<group>"; };
    87688768                4129DF811BB5B79B00322A16 /* ReadableStreamController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamController.h; sourceTree = "<group>"; };
    … …  
    1005110051                7C48A6CF191C9D6500026674 /* WebKitNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitNamespace.h; sourceTree = "<group>"; };
    1005210052                7C48A6D2191C9D8E00026674 /* WebKitNamespace.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebKitNamespace.idl; sourceTree = "<group>"; };
    10053                 7C4C96D81AD4483500365A51 /* WebCoreJSBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreJSBuiltins.cpp; sourceTree = "<group>"; };
    1005410053                7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStream.cpp; sourceTree = "<group>"; };
    1005510054                7C4C96D91AD4483500365A50 /* JSReadableStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStream.h; sourceTree = "<group>"; };
    … …  
    1132311322                9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltins.h; sourceTree = "<group>"; };
    1132411323                9B03D8071BB3110D00B764D8 /* ReadableStreamBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamBuiltinsWrapper.h; sourceTree = "<group>"; };
    11325                 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltinsWrapper.h; sourceTree = "<group>"; };
    11326                 9B03D8071BB3110D00B764D9 /* WebCoreJSBuiltinInternals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreJSBuiltinInternals.h; sourceTree = "<group>"; };
     11324                9B03D8071BB3110D00B764D9 /* ReadableStreamInternalsBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltinsWrapper.h; sourceTree = "<group>"; };
    1132711325                9B19B67E1B964E5200348745 /* ShadowRoot.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ShadowRoot.idl; sourceTree = "<group>"; };
    1132811326                9B1AB0791648C69D0051F3F2 /* HTMLFormControlsCollection.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = HTMLFormControlsCollection.idl; sourceTree = "<group>"; };
    … …  
    1628216280                        isa = PBXGroup;
    1628316281                        children = (
    16284                                 7C4C96D81AD4483500365A51 /* WebCoreJSBuiltins.cpp */,
    1628516282                                7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */,
    1628616283                                7C4C96D91AD4483500365A50 /* JSReadableStream.h */,
    … …  
    1707417071                                9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */,
    1707517072                                9B03D8071BB3110D00B764D8 /* ReadableStreamBuiltinsWrapper.h */,
    17076                                 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */,
    17077                                 9B03D8071BB3110D00B764D9 /* WebCoreJSBuiltinInternals.h */,
     17073                                9B03D8071BB3110D00B764D9 /* ReadableStreamInternalsBuiltinsWrapper.h */,
    1707817074                                43B85ED218CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp */,
    1707917075                                43B85ED318CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.gperf */,
    … …  
    2167221668                                A75E497510752ACB00C9B896 /* SerializedScriptValue.cpp */,
    2167321669                                A75E497410752ACB00C9B896 /* SerializedScriptValue.h */,
     21670                                411A90411BBAB46D000CF156 /* WebCoreJSBuiltins.cpp */,
    2167421671                                BC53D910114310CC000D817E /* WebCoreJSClientData.h */,
    2167521672                                0F099D0617B968A100FF84B9 /* WebCoreTypedArrayController.cpp */,
    … …  
    2572525722                                652FBBBC0DE27CB60001D386 /* JSDOMWindowCustom.h in Headers */,
    2572625723                                BCBFB53D0DCD29CF0019B3E5 /* JSDOMWindowShell.h in Headers */,
    25727                                 416E6FEA1BBD1684000A6044 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */,
    25728                                 416E6FEA1BBD1684000A6043 /* WebCoreJSBuiltinInternals.h in Headers */,
     25724                                416E6FEA1BBD1684000A6043 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */,
    2572925725                                65E0E9441133C89F00B4CB10 /* JSDOMWrapper.h in Headers */,
    2573025726                                FD7868BA136B999200D403DF /* JSDynamicsCompressorNode.h in Headers */,
    … …  
    2906629062                                E44613AA0CD6331000FADA75 /* HTMLVideoElement.cpp in Sources */,
    2906729063                                839AAFEC1A0C0C8D00605F99 /* HTMLWBRElement.cpp in Sources */,
     29064                                411A90421BBAB47A000CF156 /* WebCoreJSBuiltins.cpp in Sources */,
    2906829065                                0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */,
    2906929066                                1AC900C31943C0FC008625B5 /* HTTPHeaderNames.cpp in Sources */,
    … …  
    2957729574                                B658FFA11522EF3A00DD5595 /* JSRadioNodeList.cpp in Sources */,
    2957829575                                65DF320109D1CC60000BE325 /* JSRange.cpp in Sources */,
    29579                                 7C4C96DC1AD4483500365A51 /* WebCoreJSBuiltins.cpp in Sources */,
    2958029576                                7C4C96DC1AD4483500365A50 /* JSReadableStream.cpp in Sources */,
    2958129577                                6C4C96DE1AD4483500365A50 /* JSReadableStreamController.cpp in Sources */,

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

    r190716 r190723  
    3737    VM::ClientData* clientData = m_vm.clientData;
    3838    ASSERT(clientData);
    39     static_cast<JSVMClientData*>(clientData)->rememberWorld(*this);
     39    static_cast<WebCoreJSClientData*>(clientData)->rememberWorld(*this);
    4040}
    4141
    … …  
    4444    VM::ClientData* clientData = m_vm.clientData;
    4545    ASSERT(clientData);
    46     static_cast<JSVMClientData*>(clientData)->forgetWorld(*this);
     46    static_cast<WebCoreJSClientData*>(clientData)->forgetWorld(*this);
    4747
    4848    // These items are created lazily.
    … …  
    6464    VM::ClientData* clientData = vm.clientData;
    6565    ASSERT(clientData);
    66     return static_cast<JSVMClientData*>(clientData)->normalWorld();
     66    return static_cast<WebCoreJSClientData*>(clientData)->normalWorld();
    6767}
    6868

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

    r190716 r190723  
    7171    , m_impl(window)
    7272    , m_shell(shell)
    73     , m_privateFunctions(vm)
     73#if ENABLE(STREAMS_API)
     74    , m_readableStreamFunctions(vm)
     75#endif
    7476{
    7577}
    … …  
    8082    ASSERT(inherits(info()));
    8183
    82     m_privateFunctions.init(*this);
     84#if ENABLE(STREAMS_API)
     85    m_readableStreamFunctions.init(*this);
     86#endif
    8387
    8488    GlobalPropertyInfo staticGlobals[] = {
    … …  
    8690        GlobalPropertyInfo(vm.propertyNames->window, m_shell, DontDelete | ReadOnly),
    8791#if ENABLE(STREAMS_API)
    88         GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().readableStreamClosedPrivateName(), jsNumber(1), DontDelete | ReadOnly),
    89         GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().readableStreamErroredPrivateName(), jsNumber(2), DontDelete | ReadOnly),
    90         GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().readableStreamReadablePrivateName(), jsNumber(3), DontDelete | ReadOnly),
    91         GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().ReadableStreamControllerPrivateName(), createReadableStreamControllerPrivateConstructor(vm, *this), DontDelete | ReadOnly),
    92         GlobalPropertyInfo(static_cast<JSVMClientData*>(vm.clientData)->builtinNames().ReadableStreamReaderPrivateName(), createReadableStreamReaderPrivateConstructor(vm, *this), DontDelete | ReadOnly),
     92        GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().readableStreamClosedPrivateName(), jsNumber(1), DontDelete | ReadOnly),
     93        GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().readableStreamErroredPrivateName(), jsNumber(2), DontDelete | ReadOnly),
     94        GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().readableStreamReadablePrivateName(), jsNumber(3), DontDelete | ReadOnly),
     95        GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().ReadableStreamControllerPrivateName(), createReadableStreamControllerPrivateConstructor(vm, *this), DontDelete | ReadOnly),
     96        GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().ReadableStreamReaderPrivateName(), createReadableStreamReaderPrivateConstructor(vm, *this), DontDelete | ReadOnly),
    9397#define DECLARE_GLOBAL_STATIC(name)\
    9498        GlobalPropertyInfo(\
    95             static_cast<JSVMClientData*>(vm.clientData)->builtinFunctions().readableStreamInternalsBuiltins().name##PrivateName(), \
    96             m_privateFunctions.readableStreamInternals().m_##name##Function.get() , DontDelete | ReadOnly),
     99            static_cast<WebCoreJSClientData*>(vm.clientData)->readableStreamInternalsBuiltins().name##PrivateName(),\
     100            m_readableStreamFunctions.m_##name##Function.get() , DontDelete | ReadOnly),
    97101        WEBCOREREADABLESTREAMINTERNALS_FOREACH_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
    98102#undef EXPORT_FUNCTION
    … …  
    108112    ASSERT_GC_OBJECT_INHERITS(thisObject, info());
    109113    Base::visitChildren(thisObject, visitor);
    110     thisObject->m_privateFunctions.visit(visitor);
     114#if ENABLE(STREAMS_API)
     115    thisObject->m_readableStreamFunctions.visit(visitor);
     116#endif
    111117}
    112118
    … …  
    292298{
    293299    JSC::VM& vm = JSDOMWindowBase::commonVM();
    294     JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData);
     300    WebCoreJSClientData* clientData = static_cast<WebCoreJSClientData*>(vm.clientData);
    295301    Vector<Ref<DOMWrapperWorld>> wrapperWorlds;
    296302    clientData->getAllWorlds(wrapperWorlds);

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

    r190716 r190723  
    2323#include "JSDOMBinding.h"
    2424#include "JSDOMGlobalObject.h"
    25 #include "WebCoreJSBuiltinInternals.h"
     25#include "ReadableStreamInternalsBuiltinsWrapper.h"
    2626#include <wtf/Forward.h>
    2727
    … …  
    8888        JSDOMWindowShell* m_shell;
    8989
    90         JSBuiltinInternalFunctions m_privateFunctions;
     90#if ENABLE(STREAMS_API)
     91        ReadableStreamInternalsBuiltinFunctions m_readableStreamFunctions;
     92#endif
    9193    };
    9294

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

    r190716 r190723  
    195195void ScriptController::getAllWorlds(Vector<Ref<DOMWrapperWorld>>& worlds)
    196196{
    197     static_cast<JSVMClientData*>(JSDOMWindow::commonVM().clientData)->getAllWorlds(worlds);
     197    static_cast<WebCoreJSClientData*>(JSDOMWindow::commonVM().clientData)->getAllWorlds(worlds);
    198198}
    199199

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

    r190716 r190723  
    26352635    auto contents = std::make_unique<ArrayBufferContentsArray>(arrayBuffers.size());
    26362636    Vector<Ref<DOMWrapperWorld>> worlds;
    2637     static_cast<JSVMClientData*>(exec->vm().clientData)->getAllWorlds(worlds);
     2637    static_cast<WebCoreJSClientData*>(exec->vm().clientData)->getAllWorlds(worlds);
    26382638
    26392639    HashSet<JSC::ArrayBuffer*> visited;

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

    r190722 r190723  
    11/*
    2  * Copyright (C) 2015 Canon Inc.
     2 * Copyright (C) 2015, Canon Inc. All Rights Reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 // @optional=STREAMS_API
     26#include "config.h"
    2727
    28 function size()
    29 {
    30     "use strict";
    31 
    32     return 1;
    33 }
    34 
    35 function initializeCountQueuingStrategy(parameters)
    36 {
    37     "use strict";
    38 
    39     Object.defineProperty(this, "highWaterMark", {
    40         value: parameters.highWaterMark,
    41         configurable: true,
    42         enumerable: true,
    43         writable: true
    44     });
    45 }
     28#if ENABLE(STREAMS_API)
     29#include "ByteLengthQueuingStrategyBuiltins.cpp"
     30#include "CountQueuingStrategyBuiltins.cpp"
     31#include "ReadableStreamBuiltins.cpp"
     32#include "ReadableStreamControllerBuiltins.cpp"
     33#include "ReadableStreamInternalsBuiltins.cpp"
     34#include "ReadableStreamReaderBuiltins.cpp"
     35#endif

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

    r190716 r190723  
    2525#include "DOMWrapperWorld.h"
    2626#include "WebCoreBuiltinNames.h"
    27 #include "WebCoreJSBuiltins.h"
    2827#include "WebCoreTypedArrayController.h"
    2928#include <wtf/HashSet.h>
    3029#include <wtf/RefPtr.h>
    3130
     31#if ENABLE(STREAMS_API)
     32#include "ByteLengthQueuingStrategyBuiltinsWrapper.h"
     33#include "CountQueuingStrategyBuiltinsWrapper.h"
     34#include "ReadableStreamBuiltinsWrapper.h"
     35#include "ReadableStreamControllerBuiltinsWrapper.h"
     36#include "ReadableStreamInternalsBuiltinsWrapper.h"
     37#include "ReadableStreamReaderBuiltinsWrapper.h"
     38#endif
     39
    3240namespace WebCore {
    3341
    34 class JSVMClientData : public JSC::VM::ClientData {
    35     WTF_MAKE_NONCOPYABLE(JSVMClientData); WTF_MAKE_FAST_ALLOCATED;
     42class WebCoreJSClientData : public JSC::VM::ClientData {
     43    WTF_MAKE_NONCOPYABLE(WebCoreJSClientData); WTF_MAKE_FAST_ALLOCATED;
    3644    friend class VMWorldIterator;
    3745    friend void initNormalWorldClientData(JSC::VM*);
    3846
    3947public:
    40     explicit JSVMClientData(JSC::VM& vm)
    41         : m_builtinFunctions(vm)
    42         , m_builtinNames(&vm)
     48    explicit WebCoreJSClientData(JSC::VM& vm)
     49        : m_builtinNames(&vm)
     50#if ENABLE(STREAMS_API)
     51        , m_readableStreamBuiltins(&vm)
     52        , m_readableStreamControllerBuiltins(&vm)
     53        , m_readableStreamInternalsBuiltins(&vm)
     54        , m_readableStreamReaderBuiltins(&vm)
     55        , m_byteLengthQueuingStrategyBuiltins(&vm)
     56        , m_countQueuingStrategyBuiltins(&vm)
     57#endif
    4358    {
     59#if ENABLE(STREAMS_API)
     60        m_readableStreamInternalsBuiltins.exportNames();
     61#endif
    4462    }
    4563
    46     virtual ~JSVMClientData()
     64    virtual ~WebCoreJSClientData()
    4765    {
    4866        ASSERT(m_worldSet.contains(m_normalWorld.get()));
    … …  
    7795
    7896    WebCoreBuiltinNames& builtinNames() { return m_builtinNames; }
    79     JSBuiltinFunctions& builtinFunctions() { return m_builtinFunctions; }
     97
     98#if ENABLE(STREAMS_API)
     99    ReadableStreamBuiltinsWrapper& readableStreamBuiltins() { return m_readableStreamBuiltins; }
     100    ReadableStreamControllerBuiltinsWrapper& readableStreamControllerBuiltins() { return m_readableStreamControllerBuiltins; }
     101    ReadableStreamInternalsBuiltinsWrapper& readableStreamInternalsBuiltins() { return m_readableStreamInternalsBuiltins; }
     102    ReadableStreamReaderBuiltinsWrapper& readableStreamReaderBuiltins() { return m_readableStreamReaderBuiltins; }
     103    ByteLengthQueuingStrategyBuiltinsWrapper& byteLengthQueuingStrategyBuiltins() { return m_byteLengthQueuingStrategyBuiltins; }
     104    CountQueuingStrategyBuiltinsWrapper& countQueuingStrategyBuiltins() { return m_countQueuingStrategyBuiltins; }
     105#endif
    80106
    81107private:
    … …  
    83109    RefPtr<DOMWrapperWorld> m_normalWorld;
    84110
    85     JSBuiltinFunctions m_builtinFunctions;
    86111    WebCoreBuiltinNames m_builtinNames;
     112
     113#if ENABLE(STREAMS_API)
     114    ReadableStreamBuiltinsWrapper m_readableStreamBuiltins;
     115    ReadableStreamControllerBuiltinsWrapper m_readableStreamControllerBuiltins;
     116    ReadableStreamInternalsBuiltinsWrapper m_readableStreamInternalsBuiltins;
     117    ReadableStreamReaderBuiltinsWrapper m_readableStreamReaderBuiltins;
     118    ByteLengthQueuingStrategyBuiltinsWrapper m_byteLengthQueuingStrategyBuiltins;
     119    CountQueuingStrategyBuiltinsWrapper m_countQueuingStrategyBuiltins;
     120#endif
    87121};
    88122
    89123inline void initNormalWorldClientData(JSC::VM* vm)
    90124{
    91     JSVMClientData* clientData = new JSVMClientData(*vm);
    92     vm->clientData = clientData; // ~VM deletes this pointer.
    93     clientData->m_normalWorld = DOMWrapperWorld::create(*vm, true);
     125    WebCoreJSClientData* webCoreJSClientData = new WebCoreJSClientData(*vm);
     126    vm->clientData = webCoreJSClientData; // ~VM deletes this pointer.
     127    webCoreJSClientData->m_normalWorld = DOMWrapperWorld::create(*vm, true);
    94128    vm->m_typedArrayController = adoptRef(new WebCoreTypedArrayController());
    95129}
Note: See TracChangeset for help on using the changeset viewer.