Changeset 190723 in webkit
- Timestamp:
- Oct 8, 2015 8:23:24 AM (9 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 deleted
- 18 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r190722 r190723 1 2015-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 1 15 2015-10-08 Csaba Osztrogonác <ossy@webkit.org> 2 16 -
trunk/Source/JavaScriptCore/generate-js-builtins
r190716 r190723 315 315 builtinName = scopeName[0].lower() + scopeName[1:] 316 316 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()); \\ 319 319 """% (builtinName, builtinName)) 320 320 -
trunk/Source/WebCore/CMakeLists.txt
r190716 r190723 1243 1243 bindings/js/ScriptState.cpp 1244 1244 bindings/js/SerializedScriptValue.cpp 1245 bindings/js/WebCoreJSBuiltins.cpp 1245 1246 bindings/js/WebCoreTypedArrayController.cpp 1246 1247 bindings/js/WorkerScriptController.cpp … … 3582 3583 add_custom_command( 3583 3584 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-builtins3585 MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/generate-js-builtins 3585 3586 DEPENDS ${WebCore_GENERATE_JS_BUILTINS_SCRIPTS_DIR}/generate-js-builtins 3586 3587 DEPENDS ${_builtinjs} … … 3593 3594 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/bindings/js/WebCoreJSBuiltins.cpp ${_name}Builtins.cpp) 3594 3595 endforeach () 3595 add_custom_command(3596 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.cpp3597 MAIN_DEPENDENCY ${WEBCORE_DIR}/generate-js-builtins-allinone3598 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_SOURCES3602 ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltinInternals.h3603 ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h3604 ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.cpp3605 )3606 3596 3607 3597 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp) -
trunk/Source/WebCore/ChangeLog
r190721 r190723 1 2015-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 1 15 2015-10-08 Sergio Villar Senin <svillar@igalia.com> 2 16 -
trunk/Source/WebCore/DerivedSources.make
r190716 r190723 1252 1252 # WebCore JS Builtins 1253 1253 1254 WEBCORE_JS_BUILTINS _SOURCE= \1254 WEBCORE_JS_BUILTINS = \ 1255 1255 $(WebCore)/Modules/streams/ByteLengthQueuingStrategy.js \ 1256 1256 $(WebCore)/Modules/streams/CountQueuingStrategy.js \ … … 1261 1261 # 1262 1262 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 1263 all : $(WEBCORE_JS_BUILTINS:%.js=%Builtins.cpp) 1264 1265 %Builtins.cpp: %.js 1273 1266 $(PYTHON) $(WebCore)/generate-js-builtins --input $< --generate_js_builtins_path $(GenerateJSBuiltinsScripts) 1274 1267 -
trunk/Source/WebCore/Modules/streams/ByteLengthQueuingStrategy.js
r190716 r190723 25 25 */ 26 26 27 // @optional=STREAMS_API28 29 27 function size(chunk) 30 28 { -
trunk/Source/WebCore/Modules/streams/CountQueuingStrategy.js
r190716 r190723 24 24 */ 25 25 26 // @optional=STREAMS_API27 28 26 function size() 29 27 { -
trunk/Source/WebCore/Modules/streams/ReadableStream.js
r190716 r190723 98 98 } 99 99 100 // @optional=STREAMS_API101 102 100 function pipeThrough(streams, options) 103 101 { -
trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js
r190716 r190723 72 72 } 73 73 74 // @optional=STREAMS_API75 // @internals76 77 74 function teeReadableStream(stream, shouldClone) 78 75 { -
trunk/Source/WebCore/WebCore.order
r190716 r190723 24724 24724 __ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_6DOMURLEE13jsDOMURLOwner 24725 24725 __ZN7WebCoreL27JSDOMWindowConstructorTableE 24726 __ZTVN7WebCore19 JSVMClientDataE24726 __ZTVN7WebCore19WebCoreJSClientDataE 24727 24727 __ZN7WebCoreL40JSDynamicsCompressorNodeConstructorTableE 24728 24728 __ZN7WebCoreL38JSDynamicsCompressorNodePrototypeTableE -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r190716 r190723 232 232 </ItemDefinitionGroup> 233 233 <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>248 234 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\ColorData.cpp" /> 249 235 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\CSSGrammar.cpp"> … … 18903 18889 </ClCompile> 18904 18890 <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"> 18905 18905 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> 18906 18906 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r190716 r190723 1486 1486 40ECAE8116B8B68A00C36103 /* JSDOMError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40ECAE8016B8B68A00C36103 /* JSDOMError.cpp */; }; 1487 1487 410B7E721045FAB000D8224F /* JSMessageEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */; }; 1488 411A90421BBAB47A000CF156 /* WebCoreJSBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 411A90411BBAB46D000CF156 /* WebCoreJSBuiltins.cpp */; }; 1488 1489 4123081B138C429700BCCFCA /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93F19B1A08245E5A001E9ABC /* WebCore.framework */; }; 1489 1490 41230913138C42FF00BCCFCA /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8216299029F4FB501000131 /* JavaScriptCore.framework */; }; … … 1508 1509 416E6FE81BBD12DF000A6043 /* ReadableStreamInternalsBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1509 1510 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, ); }; }; 1512 1512 417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417253A81354BBBC00360F2A /* MediaControlElements.cpp */; }; 1513 1513 417253AB1354BBBC00360F2A /* MediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = 417253A91354BBBC00360F2A /* MediaControlElements.h */; }; … … 2633 2633 7C48A6D1191C9D6500026674 /* WebKitNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C48A6CF191C9D6500026674 /* WebKitNamespace.h */; }; 2634 2634 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 */; };2636 2635 7C4C96DC1AD4483500365A50 /* JSReadableStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */; }; 2637 2636 7C4C96DD1AD4483500365A50 /* JSReadableStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4C96D91AD4483500365A50 /* JSReadableStream.h */; }; … … 8765 8764 410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessageEventCustom.cpp; sourceTree = "<group>"; }; 8766 8765 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>"; }; 8767 8767 4127D5360F8AAB1D00E424F5 /* ScriptState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptState.cpp; sourceTree = "<group>"; }; 8768 8768 4129DF811BB5B79B00322A16 /* ReadableStreamController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamController.h; sourceTree = "<group>"; }; … … 10051 10051 7C48A6CF191C9D6500026674 /* WebKitNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitNamespace.h; sourceTree = "<group>"; }; 10052 10052 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>"; };10054 10053 7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStream.cpp; sourceTree = "<group>"; }; 10055 10054 7C4C96D91AD4483500365A50 /* JSReadableStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStream.h; sourceTree = "<group>"; }; … … 11323 11322 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltins.h; sourceTree = "<group>"; }; 11324 11323 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>"; }; 11327 11325 9B19B67E1B964E5200348745 /* ShadowRoot.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ShadowRoot.idl; sourceTree = "<group>"; }; 11328 11326 9B1AB0791648C69D0051F3F2 /* HTMLFormControlsCollection.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = HTMLFormControlsCollection.idl; sourceTree = "<group>"; }; … … 16282 16280 isa = PBXGroup; 16283 16281 children = ( 16284 7C4C96D81AD4483500365A51 /* WebCoreJSBuiltins.cpp */,16285 16282 7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */, 16286 16283 7C4C96D91AD4483500365A50 /* JSReadableStream.h */, … … 17074 17071 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */, 17075 17072 9B03D8071BB3110D00B764D8 /* ReadableStreamBuiltinsWrapper.h */, 17076 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */, 17077 9B03D8071BB3110D00B764D9 /* WebCoreJSBuiltinInternals.h */, 17073 9B03D8071BB3110D00B764D9 /* ReadableStreamInternalsBuiltinsWrapper.h */, 17078 17074 43B85ED218CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp */, 17079 17075 43B85ED318CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.gperf */, … … 21672 21668 A75E497510752ACB00C9B896 /* SerializedScriptValue.cpp */, 21673 21669 A75E497410752ACB00C9B896 /* SerializedScriptValue.h */, 21670 411A90411BBAB46D000CF156 /* WebCoreJSBuiltins.cpp */, 21674 21671 BC53D910114310CC000D817E /* WebCoreJSClientData.h */, 21675 21672 0F099D0617B968A100FF84B9 /* WebCoreTypedArrayController.cpp */, … … 25725 25722 652FBBBC0DE27CB60001D386 /* JSDOMWindowCustom.h in Headers */, 25726 25723 BCBFB53D0DCD29CF0019B3E5 /* JSDOMWindowShell.h in Headers */, 25727 416E6FEA1BBD1684000A6044 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */, 25728 416E6FEA1BBD1684000A6043 /* WebCoreJSBuiltinInternals.h in Headers */, 25724 416E6FEA1BBD1684000A6043 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */, 25729 25725 65E0E9441133C89F00B4CB10 /* JSDOMWrapper.h in Headers */, 25730 25726 FD7868BA136B999200D403DF /* JSDynamicsCompressorNode.h in Headers */, … … 29066 29062 E44613AA0CD6331000FADA75 /* HTMLVideoElement.cpp in Sources */, 29067 29063 839AAFEC1A0C0C8D00605F99 /* HTMLWBRElement.cpp in Sources */, 29064 411A90421BBAB47A000CF156 /* WebCoreJSBuiltins.cpp in Sources */, 29068 29065 0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */, 29069 29066 1AC900C31943C0FC008625B5 /* HTTPHeaderNames.cpp in Sources */, … … 29577 29574 B658FFA11522EF3A00DD5595 /* JSRadioNodeList.cpp in Sources */, 29578 29575 65DF320109D1CC60000BE325 /* JSRange.cpp in Sources */, 29579 7C4C96DC1AD4483500365A51 /* WebCoreJSBuiltins.cpp in Sources */,29580 29576 7C4C96DC1AD4483500365A50 /* JSReadableStream.cpp in Sources */, 29581 29577 6C4C96DE1AD4483500365A50 /* JSReadableStreamController.cpp in Sources */, -
trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp
r190716 r190723 37 37 VM::ClientData* clientData = m_vm.clientData; 38 38 ASSERT(clientData); 39 static_cast< JSVMClientData*>(clientData)->rememberWorld(*this);39 static_cast<WebCoreJSClientData*>(clientData)->rememberWorld(*this); 40 40 } 41 41 … … 44 44 VM::ClientData* clientData = m_vm.clientData; 45 45 ASSERT(clientData); 46 static_cast< JSVMClientData*>(clientData)->forgetWorld(*this);46 static_cast<WebCoreJSClientData*>(clientData)->forgetWorld(*this); 47 47 48 48 // These items are created lazily. … … 64 64 VM::ClientData* clientData = vm.clientData; 65 65 ASSERT(clientData); 66 return static_cast< JSVMClientData*>(clientData)->normalWorld();66 return static_cast<WebCoreJSClientData*>(clientData)->normalWorld(); 67 67 } 68 68 -
trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp
r190716 r190723 71 71 , m_impl(window) 72 72 , m_shell(shell) 73 , m_privateFunctions(vm) 73 #if ENABLE(STREAMS_API) 74 , m_readableStreamFunctions(vm) 75 #endif 74 76 { 75 77 } … … 80 82 ASSERT(inherits(info())); 81 83 82 m_privateFunctions.init(*this); 84 #if ENABLE(STREAMS_API) 85 m_readableStreamFunctions.init(*this); 86 #endif 83 87 84 88 GlobalPropertyInfo staticGlobals[] = { … … 86 90 GlobalPropertyInfo(vm.propertyNames->window, m_shell, DontDelete | ReadOnly), 87 91 #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), 93 97 #define DECLARE_GLOBAL_STATIC(name)\ 94 98 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), 97 101 WEBCOREREADABLESTREAMINTERNALS_FOREACH_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC) 98 102 #undef EXPORT_FUNCTION … … 108 112 ASSERT_GC_OBJECT_INHERITS(thisObject, info()); 109 113 Base::visitChildren(thisObject, visitor); 110 thisObject->m_privateFunctions.visit(visitor); 114 #if ENABLE(STREAMS_API) 115 thisObject->m_readableStreamFunctions.visit(visitor); 116 #endif 111 117 } 112 118 … … 292 298 { 293 299 JSC::VM& vm = JSDOMWindowBase::commonVM(); 294 JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData);300 WebCoreJSClientData* clientData = static_cast<WebCoreJSClientData*>(vm.clientData); 295 301 Vector<Ref<DOMWrapperWorld>> wrapperWorlds; 296 302 clientData->getAllWorlds(wrapperWorlds); -
trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h
r190716 r190723 23 23 #include "JSDOMBinding.h" 24 24 #include "JSDOMGlobalObject.h" 25 #include " WebCoreJSBuiltinInternals.h"25 #include "ReadableStreamInternalsBuiltinsWrapper.h" 26 26 #include <wtf/Forward.h> 27 27 … … 88 88 JSDOMWindowShell* m_shell; 89 89 90 JSBuiltinInternalFunctions m_privateFunctions; 90 #if ENABLE(STREAMS_API) 91 ReadableStreamInternalsBuiltinFunctions m_readableStreamFunctions; 92 #endif 91 93 }; 92 94 -
trunk/Source/WebCore/bindings/js/ScriptController.cpp
r190716 r190723 195 195 void ScriptController::getAllWorlds(Vector<Ref<DOMWrapperWorld>>& worlds) 196 196 { 197 static_cast< JSVMClientData*>(JSDOMWindow::commonVM().clientData)->getAllWorlds(worlds);197 static_cast<WebCoreJSClientData*>(JSDOMWindow::commonVM().clientData)->getAllWorlds(worlds); 198 198 } 199 199 -
trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp
r190716 r190723 2635 2635 auto contents = std::make_unique<ArrayBufferContentsArray>(arrayBuffers.size()); 2636 2636 Vector<Ref<DOMWrapperWorld>> worlds; 2637 static_cast< JSVMClientData*>(exec->vm().clientData)->getAllWorlds(worlds);2637 static_cast<WebCoreJSClientData*>(exec->vm().clientData)->getAllWorlds(worlds); 2638 2638 2639 2639 HashSet<JSC::ArrayBuffer*> visited; -
trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.cpp
r190722 r190723 1 1 /* 2 * Copyright (C) 2015 Canon Inc.2 * Copyright (C) 2015, Canon Inc. All Rights Reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 // @optional=STREAMS_API 26 #include "config.h" 27 27 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 25 25 #include "DOMWrapperWorld.h" 26 26 #include "WebCoreBuiltinNames.h" 27 #include "WebCoreJSBuiltins.h"28 27 #include "WebCoreTypedArrayController.h" 29 28 #include <wtf/HashSet.h> 30 29 #include <wtf/RefPtr.h> 31 30 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 32 40 namespace WebCore { 33 41 34 class JSVMClientData : public JSC::VM::ClientData {35 WTF_MAKE_NONCOPYABLE( JSVMClientData); WTF_MAKE_FAST_ALLOCATED;42 class WebCoreJSClientData : public JSC::VM::ClientData { 43 WTF_MAKE_NONCOPYABLE(WebCoreJSClientData); WTF_MAKE_FAST_ALLOCATED; 36 44 friend class VMWorldIterator; 37 45 friend void initNormalWorldClientData(JSC::VM*); 38 46 39 47 public: 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 43 58 { 59 #if ENABLE(STREAMS_API) 60 m_readableStreamInternalsBuiltins.exportNames(); 61 #endif 44 62 } 45 63 46 virtual ~ JSVMClientData()64 virtual ~WebCoreJSClientData() 47 65 { 48 66 ASSERT(m_worldSet.contains(m_normalWorld.get())); … … 77 95 78 96 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 80 106 81 107 private: … … 83 109 RefPtr<DOMWrapperWorld> m_normalWorld; 84 110 85 JSBuiltinFunctions m_builtinFunctions;86 111 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 87 121 }; 88 122 89 123 inline void initNormalWorldClientData(JSC::VM* vm) 90 124 { 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); 94 128 vm->m_typedArrayController = adoptRef(new WebCoreTypedArrayController()); 95 129 }
Note: See TracChangeset
for help on using the changeset viewer.