<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[190668] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/190668">190668</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-07 09:11:46 -0700 (Wed, 07 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/190664">r190664</a>.
https://bugs.webkit.org/show_bug.cgi?id=149877
mac build is sometimes borken due to missing generated header
file (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/190664</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoregeneratejsbuiltins">trunk/Source/JavaScriptCore/generate-js-builtins</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsByteLengthQueuingStrategyjs">trunk/Source/WebCore/Modules/streams/ByteLengthQueuingStrategy.js</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsCountQueuingStrategyjs">trunk/Source/WebCore/Modules/streams/CountQueuingStrategy.js</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamjs">trunk/Source/WebCore/Modules/streams/ReadableStream.js</a></li>
<li><a href="#trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs">trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js</a></li>
<li><a href="#trunkSourceWebCoreWebCoreorder">trunk/Source/WebCore/WebCore.order</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsDOMWrapperWorldcpp">trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBaseh">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSClientDatah">trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoregeneratejsbuiltinsallinone">trunk/Source/WebCore/generate-js-builtins-allinone</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-07 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r190664.
+ https://bugs.webkit.org/show_bug.cgi?id=149877
+
+ mac build is sometimes borken due to missing generated header
+ file (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/190664
+
</ins><span class="cx"> 2015-10-07 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Automate WebCore JS builtins generation and build system
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoregeneratejsbuiltins"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/generate-js-builtins (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/generate-js-builtins 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/JavaScriptCore/generate-js-builtins 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -314,8 +314,8 @@
</span><span class="cx"> else:
</span><span class="cx"> builtinName = scopeName[0].lower() + scopeName[1:]
</span><span class="cx"> builtinsImplementation.write("""{\\
</span><del>- JSClientData* clientData = static_cast<JSClientData*>(vm.clientData); \\
- return clientData->builtinFunctions().%s().codeName##Executable()->link(vm, clientData->builtinFunctions().%s().codeName##Source()); \\
</del><ins>+ WebCoreJSClientData* clientData = static_cast<WebCoreJSClientData*>(vm.clientData); \\
+ return clientData->%s().codeName##Executable()->link(vm, clientData->%s().codeName##Source()); \\
</ins><span class="cx"> """% (builtinName, builtinName))
</span><span class="cx">
</span><span class="cx"> builtinsImplementation.write("""}
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -1242,6 +1242,7 @@
</span><span class="cx"> bindings/js/ScriptGlobalObject.cpp
</span><span class="cx"> bindings/js/ScriptState.cpp
</span><span class="cx"> bindings/js/SerializedScriptValue.cpp
</span><ins>+ bindings/js/WebCoreJSBuiltins.cpp
</ins><span class="cx"> bindings/js/WebCoreTypedArrayController.cpp
</span><span class="cx"> bindings/js/WorkerScriptController.cpp
</span><span class="cx"> bindings/js/WorkerScriptDebugServer.cpp
</span><span class="lines">@@ -3592,17 +3593,6 @@
</span><span class="cx"> )
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/bindings/js/WebCoreJSBuiltins.cpp ${_name}Builtins.cpp)
</span><span class="cx"> endforeach ()
</span><del>-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/PrivateWebCoreJSBuiltins.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.cpp
- MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/generate-js-builtins-allinone
- DEPENDS ${WebCore_GENERATE_JS_BUILTINS_SCRIPTS_DIR}/generate-js-builtins
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/generate-js-builtins-allinone ${WEBCORE_JS_BUILTINS} --output_dir ${DERIVED_SOURCES_WEBCORE_DIR}
- VERBATIM)
-list(APPEND WebCore_SOURCES
- ${DERIVED_SOURCES_WEBCORE_DIR}/PrivateWebCoreJSBuiltins.h
- ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.h
- ${DERIVED_SOURCES_WEBCORE_DIR}/WebCoreJSBuiltins.cpp
-)
</del><span class="cx">
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/ChangeLog 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-07 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r190664.
+ https://bugs.webkit.org/show_bug.cgi?id=149877
+
+ mac build is sometimes borken due to missing generated header
+ file (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/190664
+
</ins><span class="cx"> 2015-10-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> will-change should trigger stacking context based purely on properties
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/DerivedSources.make 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -1260,12 +1260,9 @@
</span><span class="cx"> $(WebCore)/Modules/streams/ReadableStreamReader.js \
</span><span class="cx"> #
</span><span class="cx">
</span><del>-all : WebCoreJSBuiltins.cpp $(WEBCORE_JS_BUILTINS:%.js=%Builtins.cpp)
</del><ins>+all : $(WEBCORE_JS_BUILTINS:%.js=%Builtins.cpp)
</ins><span class="cx">
</span><del>-WebCoreJSBuiltins.cpp: $(WEBCORE_JS_BUILTINS) $(WebCore)/generate-js-builtins-allinone
- $(PYTHON) $(WebCore)/generate-js-builtins-allinone $(WEBCORE_JS_BUILTINS) --output_dir .
-
-%Builtins.cpp: %.js $(WebCore)/generate-js-builtins
</del><ins>+%Builtins.cpp: %.js
</ins><span class="cx"> $(PYTHON) $(WebCore)/generate-js-builtins --input $< --generate_js_builtins_path $(GenerateJSBuiltinsScripts)
</span><span class="cx">
</span><span class="cx"> # ------------------------
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsByteLengthQueuingStrategyjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ByteLengthQueuingStrategy.js (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ByteLengthQueuingStrategy.js 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/Modules/streams/ByteLengthQueuingStrategy.js 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -24,8 +24,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// @optional=STREAMS_API
-
</del><span class="cx"> function size(chunk)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsCountQueuingStrategyjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/CountQueuingStrategy.js (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/CountQueuingStrategy.js 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/Modules/streams/CountQueuingStrategy.js 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// @optional=STREAMS_API
-
</del><span class="cx"> function size()
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStream.js (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/Modules/streams/ReadableStream.js 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -97,8 +97,6 @@
</span><span class="cx"> return new @ReadableStreamReader(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// @optional=STREAMS_API
-
</del><span class="cx"> function pipeThrough(streams, options)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesstreamsReadableStreamInternalsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/Modules/streams/ReadableStreamInternals.js 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -71,9 +71,6 @@
</span><span class="cx"> return this;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// @optional=STREAMS_API
-// @internals
-
</del><span class="cx"> function teeReadableStream(stream, shouldClone)
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/WebCore.order 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -24723,7 +24723,7 @@
</span><span class="cx"> __ZZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_6DOMURLEE13jsDOMURLOwner
</span><span class="cx"> __ZGVZN7WebCore12wrapperOwnerEPNS_15DOMWrapperWorldEPNS_6DOMURLEE13jsDOMURLOwner
</span><span class="cx"> __ZN7WebCoreL27JSDOMWindowConstructorTableE
</span><del>-__ZTVN7WebCore19JSClientDataE
</del><ins>+__ZTVN7WebCore19WebCoreJSClientDataE
</ins><span class="cx"> __ZN7WebCoreL40JSDynamicsCompressorNodeConstructorTableE
</span><span class="cx"> __ZN7WebCoreL38JSDynamicsCompressorNodePrototypeTableE
</span><span class="cx"> __ZN7WebCoreL29JSDynamicsCompressorNodeTableE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -231,20 +231,6 @@
</span><span class="cx"> <ClCompile />
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\WebCoreJSBuiltins.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\ColorData.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\CSSGrammar.cpp">
</span><span class="cx"> <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4065;4273;4565;4701;4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</span><span class="lines">@@ -18915,6 +18901,20 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\bindings\js\WebCoreJSBuiltins.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="..\bindings\js\WorkerScriptController.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -1485,6 +1485,7 @@
</span><span class="cx"> 40ECAE7E16B8B67200C36103 /* JSDOMError.h in Headers */ = {isa = PBXBuildFile; fileRef = 40ECAE7D16B8B67200C36103 /* JSDOMError.h */; };
</span><span class="cx"> 40ECAE8116B8B68A00C36103 /* JSDOMError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 40ECAE8016B8B68A00C36103 /* JSDOMError.cpp */; };
</span><span class="cx"> 410B7E721045FAB000D8224F /* JSMessageEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */; };
</span><ins>+ 411A90421BBAB47A000CF156 /* WebCoreJSBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 411A90411BBAB46D000CF156 /* WebCoreJSBuiltins.cpp */; };
</ins><span class="cx"> 4123081B138C429700BCCFCA /* WebCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93F19B1A08245E5A001E9ABC /* WebCore.framework */; };
</span><span class="cx"> 41230913138C42FF00BCCFCA /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8216299029F4FB501000131 /* JavaScriptCore.framework */; };
</span><span class="cx"> 4127D5370F8AAB1D00E424F5 /* ScriptState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4127D5360F8AAB1D00E424F5 /* ScriptState.cpp */; };
</span><span class="lines">@@ -1507,8 +1508,7 @@
</span><span class="cx"> 416E29A6102FA962007FC14E /* WorkerReportingProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 416E29A5102FA962007FC14E /* WorkerReportingProxy.h */; };
</span><span class="cx"> 416E6FE81BBD12DF000A6043 /* ReadableStreamInternalsBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 416E6FE91BBD12E5000A6043 /* ReadableStreamBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764D8 /* ReadableStreamBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 416E6FEA1BBD1684000A6044 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 416E6FEA1BBD1684000A6043 /* PrivateWebCoreJSBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764D9 /* PrivateWebCoreJSBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 416E6FEA1BBD1684000A6043 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764D9 /* ReadableStreamInternalsBuiltinsWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 417253AA1354BBBC00360F2A /* MediaControlElements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417253A81354BBBC00360F2A /* MediaControlElements.cpp */; };
</span><span class="cx"> 417253AB1354BBBC00360F2A /* MediaControlElements.h in Headers */ = {isa = PBXBuildFile; fileRef = 417253A91354BBBC00360F2A /* MediaControlElements.h */; };
</span><span class="cx"> 417DA6D913734E6E007C57FB /* Internals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 417DA4CF13734326007C57FB /* Internals.cpp */; };
</span><span class="lines">@@ -2632,7 +2632,6 @@
</span><span class="cx"> 7C48A6D0191C9D6500026674 /* WebKitNamespace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C48A6CE191C9D6500026674 /* WebKitNamespace.cpp */; };
</span><span class="cx"> 7C48A6D1191C9D6500026674 /* WebKitNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C48A6CF191C9D6500026674 /* WebKitNamespace.h */; };
</span><span class="cx"> 7C4902A218B825F8007D9298 /* DOMWheelEventInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85989DCA0ACC8BBD00A0BC51 /* DOMWheelEventInternal.h */; };
</span><del>- 7C4C96DC1AD4483500365A51 /* WebCoreJSBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96D81AD4483500365A51 /* WebCoreJSBuiltins.cpp */; };
</del><span class="cx"> 7C4C96DC1AD4483500365A50 /* JSReadableStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */; };
</span><span class="cx"> 7C4C96DD1AD4483500365A50 /* JSReadableStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C4C96D91AD4483500365A50 /* JSReadableStream.h */; };
</span><span class="cx"> 7C4C96DE1AD4483500365A50 /* JSReadableStreamReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C4C96DA1AD4483500365A50 /* JSReadableStreamReader.cpp */; };
</span><span class="lines">@@ -8764,6 +8763,7 @@
</span><span class="cx"> 40ECAE8016B8B68A00C36103 /* JSDOMError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMError.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 410B7E711045FAB000D8224F /* JSMessageEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMessageEventCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 41189EF71AD8232800B90A0D /* ReadableStreamController.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ReadableStreamController.idl; sourceTree = "<group>"; };
</span><ins>+ 411A90411BBAB46D000CF156 /* WebCoreJSBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreJSBuiltins.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 4127D5360F8AAB1D00E424F5 /* ScriptState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptState.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4129DF811BB5B79B00322A16 /* ReadableStreamController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamController.h; sourceTree = "<group>"; };
</span><span class="cx"> 4129DF821BB5B7A600322A16 /* ReadableStreamReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamReader.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -10050,7 +10050,6 @@
</span><span class="cx"> 7C48A6CE191C9D6500026674 /* WebKitNamespace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebKitNamespace.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C48A6CF191C9D6500026674 /* WebKitNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitNamespace.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C48A6D2191C9D8E00026674 /* WebKitNamespace.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = WebKitNamespace.idl; sourceTree = "<group>"; };
</span><del>- 7C4C96D81AD4483500365A51 /* WebCoreJSBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreJSBuiltins.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStream.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C4C96D91AD4483500365A50 /* JSReadableStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSReadableStream.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C4C96DA1AD4483500365A50 /* JSReadableStreamReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSReadableStreamReader.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -11322,8 +11321,7 @@
</span><span class="cx"> 9B03D8061BB3110D00B764D8 /* ReadableStreamBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamBuiltins.h; sourceTree = "<group>"; };
</span><span class="cx"> 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltins.h; sourceTree = "<group>"; };
</span><span class="cx"> 9B03D8071BB3110D00B764D8 /* ReadableStreamBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamBuiltinsWrapper.h; sourceTree = "<group>"; };
</span><del>- 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltinsWrapper.h; sourceTree = "<group>"; };
- 9B03D8071BB3110D00B764D9 /* PrivateWebCoreJSBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrivateWebCoreJSBuiltins.h; sourceTree = "<group>"; };
</del><ins>+ 9B03D8071BB3110D00B764D9 /* ReadableStreamInternalsBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltinsWrapper.h; sourceTree = "<group>"; };
</ins><span class="cx"> 9B19B67E1B964E5200348745 /* ShadowRoot.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ShadowRoot.idl; sourceTree = "<group>"; };
</span><span class="cx"> 9B1AB0791648C69D0051F3F2 /* HTMLFormControlsCollection.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = HTMLFormControlsCollection.idl; sourceTree = "<group>"; };
</span><span class="cx"> 9B1AB07B1648C7C40051F3F2 /* JSHTMLFormControlsCollectionCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSHTMLFormControlsCollectionCustom.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16281,7 +16279,6 @@
</span><span class="cx"> 41A023FA1A39F13A00F722CF /* Streams */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 7C4C96D81AD4483500365A51 /* WebCoreJSBuiltins.cpp */,
</del><span class="cx"> 7C4C96D81AD4483500365A50 /* JSReadableStream.cpp */,
</span><span class="cx"> 7C4C96D91AD4483500365A50 /* JSReadableStream.h */,
</span><span class="cx"> 6C4C96DA1AD4483500365A50 /* JSReadableStreamController.cpp */,
</span><span class="lines">@@ -17073,8 +17070,7 @@
</span><span class="cx"> 9B03D8061BB3110D00B764D8 /* ReadableStreamBuiltins.h */,
</span><span class="cx"> 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */,
</span><span class="cx"> 9B03D8071BB3110D00B764D8 /* ReadableStreamBuiltinsWrapper.h */,
</span><del>- 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */,
- 9B03D8071BB3110D00B764D9 /* PrivateWebCoreJSBuiltins.h */,
</del><ins>+ 9B03D8071BB3110D00B764D9 /* ReadableStreamInternalsBuiltinsWrapper.h */,
</ins><span class="cx"> 43B85ED218CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp */,
</span><span class="cx"> 43B85ED318CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.gperf */,
</span><span class="cx"> 26AA0F9D18D2A18B00419381 /* SelectorPseudoElementTypeMap.cpp */,
</span><span class="lines">@@ -21671,6 +21667,7 @@
</span><span class="cx"> 1400D7A717136EA70077CE05 /* ScriptWrappableInlines.h */,
</span><span class="cx"> A75E497510752ACB00C9B896 /* SerializedScriptValue.cpp */,
</span><span class="cx"> A75E497410752ACB00C9B896 /* SerializedScriptValue.h */,
</span><ins>+ 411A90411BBAB46D000CF156 /* WebCoreJSBuiltins.cpp */,
</ins><span class="cx"> BC53D910114310CC000D817E /* WebCoreJSClientData.h */,
</span><span class="cx"> 0F099D0617B968A100FF84B9 /* WebCoreTypedArrayController.cpp */,
</span><span class="cx"> 0F099D0717B968A100FF84B9 /* WebCoreTypedArrayController.h */,
</span><span class="lines">@@ -25724,8 +25721,7 @@
</span><span class="cx"> FC9E0E4D16419C1E00392BE3 /* JSDOMWindowCSS.h in Headers */,
</span><span class="cx"> 652FBBBC0DE27CB60001D386 /* JSDOMWindowCustom.h in Headers */,
</span><span class="cx"> BCBFB53D0DCD29CF0019B3E5 /* JSDOMWindowShell.h in Headers */,
</span><del>- 416E6FEA1BBD1684000A6044 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */,
- 416E6FEA1BBD1684000A6043 /* PrivateWebCoreJSBuiltins.h in Headers */,
</del><ins>+ 416E6FEA1BBD1684000A6043 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */,
</ins><span class="cx"> 65E0E9441133C89F00B4CB10 /* JSDOMWrapper.h in Headers */,
</span><span class="cx"> FD7868BA136B999200D403DF /* JSDynamicsCompressorNode.h in Headers */,
</span><span class="cx"> 65DF31FA09D1CC60000BE325 /* JSElement.h in Headers */,
</span><span class="lines">@@ -29065,6 +29061,7 @@
</span><span class="cx"> A8EA79F30A1916DF00A8EF5F /* HTMLUListElement.cpp in Sources */,
</span><span class="cx"> E44613AA0CD6331000FADA75 /* HTMLVideoElement.cpp in Sources */,
</span><span class="cx"> 839AAFEC1A0C0C8D00605F99 /* HTMLWBRElement.cpp in Sources */,
</span><ins>+ 411A90421BBAB47A000CF156 /* WebCoreJSBuiltins.cpp in Sources */,
</ins><span class="cx"> 0B8C56D40F28627F000502E1 /* HTTPHeaderMap.cpp in Sources */,
</span><span class="cx"> 1AC900C31943C0FC008625B5 /* HTTPHeaderNames.cpp in Sources */,
</span><span class="cx"> 514C76720CE923A1007EF3CD /* HTTPParsers.cpp in Sources */,
</span><span class="lines">@@ -29576,7 +29573,6 @@
</span><span class="cx"> 077664FC183E6B5C00133B92 /* JSQuickTimePluginReplacement.cpp in Sources */,
</span><span class="cx"> B658FFA11522EF3A00DD5595 /* JSRadioNodeList.cpp in Sources */,
</span><span class="cx"> 65DF320109D1CC60000BE325 /* JSRange.cpp in Sources */,
</span><del>- 7C4C96DC1AD4483500365A51 /* WebCoreJSBuiltins.cpp in Sources */,
</del><span class="cx"> 7C4C96DC1AD4483500365A50 /* JSReadableStream.cpp in Sources */,
</span><span class="cx"> 6C4C96DE1AD4483500365A50 /* JSReadableStreamController.cpp in Sources */,
</span><span class="cx"> 7C4C96DE1AD4483500365A50 /* JSReadableStreamReader.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsDOMWrapperWorldcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/bindings/js/DOMWrapperWorld.cpp 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -36,14 +36,14 @@
</span><span class="cx"> {
</span><span class="cx"> VM::ClientData* clientData = m_vm.clientData;
</span><span class="cx"> ASSERT(clientData);
</span><del>- static_cast<JSClientData*>(clientData)->rememberWorld(*this);
</del><ins>+ static_cast<WebCoreJSClientData*>(clientData)->rememberWorld(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMWrapperWorld::~DOMWrapperWorld()
</span><span class="cx"> {
</span><span class="cx"> VM::ClientData* clientData = m_vm.clientData;
</span><span class="cx"> ASSERT(clientData);
</span><del>- static_cast<JSClientData*>(clientData)->forgetWorld(*this);
</del><ins>+ static_cast<WebCoreJSClientData*>(clientData)->forgetWorld(*this);
</ins><span class="cx">
</span><span class="cx"> // These items are created lazily.
</span><span class="cx"> while (!m_scriptControllersWithWindowShells.isEmpty())
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM::ClientData* clientData = vm.clientData;
</span><span class="cx"> ASSERT(clientData);
</span><del>- return static_cast<JSClientData*>(clientData)->normalWorld();
</del><ins>+ return static_cast<WebCoreJSClientData*>(clientData)->normalWorld();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DOMWrapperWorld& mainThreadNormalWorld()
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -70,7 +70,9 @@
</span><span class="cx"> , m_windowCloseWatchpoints((window && window->frame()) ? IsWatched : IsInvalidated)
</span><span class="cx"> , m_impl(window)
</span><span class="cx"> , m_shell(shell)
</span><del>- , m_privateFunctions(vm)
</del><ins>+#if ENABLE(STREAMS_API)
+ , m_readableStreamFunctions(vm)
+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -79,21 +81,23 @@
</span><span class="cx"> Base::finishCreation(vm, shell);
</span><span class="cx"> ASSERT(inherits(info()));
</span><span class="cx">
</span><del>- m_privateFunctions.init(*this);
</del><ins>+#if ENABLE(STREAMS_API)
+ m_readableStreamFunctions.init(*this);
+#endif
</ins><span class="cx">
</span><span class="cx"> GlobalPropertyInfo staticGlobals[] = {
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->document, jsNull(), DontDelete | ReadOnly),
</span><span class="cx"> GlobalPropertyInfo(vm.propertyNames->window, m_shell, DontDelete | ReadOnly),
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><del>- GlobalPropertyInfo(static_cast<JSClientData*>(vm.clientData)->builtinNames().readableStreamClosedPrivateName(), jsNumber(1), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSClientData*>(vm.clientData)->builtinNames().readableStreamErroredPrivateName(), jsNumber(2), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSClientData*>(vm.clientData)->builtinNames().readableStreamReadablePrivateName(), jsNumber(3), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSClientData*>(vm.clientData)->builtinNames().ReadableStreamControllerPrivateName(), createReadableStreamControllerPrivateConstructor(vm, *this), DontDelete | ReadOnly),
- GlobalPropertyInfo(static_cast<JSClientData*>(vm.clientData)->builtinNames().ReadableStreamReaderPrivateName(), createReadableStreamReaderPrivateConstructor(vm, *this), DontDelete | ReadOnly),
</del><ins>+ GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().readableStreamClosedPrivateName(), jsNumber(1), DontDelete | ReadOnly),
+ GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().readableStreamErroredPrivateName(), jsNumber(2), DontDelete | ReadOnly),
+ GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().readableStreamReadablePrivateName(), jsNumber(3), DontDelete | ReadOnly),
+ GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().ReadableStreamControllerPrivateName(), createReadableStreamControllerPrivateConstructor(vm, *this), DontDelete | ReadOnly),
+ GlobalPropertyInfo(static_cast<WebCoreJSClientData*>(vm.clientData)->builtinNames().ReadableStreamReaderPrivateName(), createReadableStreamReaderPrivateConstructor(vm, *this), DontDelete | ReadOnly),
</ins><span class="cx"> #define DECLARE_GLOBAL_STATIC(name)\
</span><span class="cx"> GlobalPropertyInfo(\
</span><del>- static_cast<JSClientData*>(vm.clientData)->builtinFunctions().readableStreamInternalsBuiltins().name##PrivateName(), \
- m_privateFunctions.readableStreamInternals().m_##name##Function.get() , DontDelete | ReadOnly),
</del><ins>+ static_cast<WebCoreJSClientData*>(vm.clientData)->readableStreamInternalsBuiltins().name##PrivateName(),\
+ m_readableStreamFunctions.m_##name##Function.get() , DontDelete | ReadOnly),
</ins><span class="cx"> WEBCOREREADABLESTREAMINTERNALS_FOREACH_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
</span><span class="cx"> #undef EXPORT_FUNCTION
</span><span class="cx"> #endif
</span><span class="lines">@@ -107,7 +111,9 @@
</span><span class="cx"> JSDOMWindowBase* thisObject = jsCast<JSDOMWindowBase*>(cell);
</span><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObject, info());
</span><span class="cx"> Base::visitChildren(thisObject, visitor);
</span><del>- thisObject->m_privateFunctions.visit(visitor);
</del><ins>+#if ENABLE(STREAMS_API)
+ thisObject->m_readableStreamFunctions.visit(visitor);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSDOMWindowBase::destroy(JSCell* cell)
</span><span class="lines">@@ -291,7 +297,7 @@
</span><span class="cx"> void JSDOMWindowBase::fireFrameClearedWatchpointsForWindow(DOMWindow* window)
</span><span class="cx"> {
</span><span class="cx"> JSC::VM& vm = JSDOMWindowBase::commonVM();
</span><del>- JSClientData* clientData = static_cast<JSClientData*>(vm.clientData);
</del><ins>+ WebCoreJSClientData* clientData = static_cast<WebCoreJSClientData*>(vm.clientData);
</ins><span class="cx"> Vector<Ref<DOMWrapperWorld>> wrapperWorlds;
</span><span class="cx"> clientData->getAllWorlds(wrapperWorlds);
</span><span class="cx"> for (unsigned i = 0; i < wrapperWorlds.size(); ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.h 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx"> #include "JSDOMGlobalObject.h"
</span><del>-#include "PrivateWebCoreJSBuiltins.h"
</del><ins>+#include "ReadableStreamInternalsBuiltinsWrapper.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -87,7 +87,9 @@
</span><span class="cx"> RefPtr<DOMWindow> m_impl;
</span><span class="cx"> JSDOMWindowShell* m_shell;
</span><span class="cx">
</span><del>- JSBuiltinInternalFunctions m_privateFunctions;
</del><ins>+#if ENABLE(STREAMS_API)
+ ReadableStreamInternalsBuiltinFunctions m_readableStreamFunctions;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Returns a JSDOMWindow or jsNull()
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx">
</span><span class="cx"> void ScriptController::getAllWorlds(Vector<Ref<DOMWrapperWorld>>& worlds)
</span><span class="cx"> {
</span><del>- static_cast<JSClientData*>(JSDOMWindow::commonVM().clientData)->getAllWorlds(worlds);
</del><ins>+ static_cast<WebCoreJSClientData*>(JSDOMWindow::commonVM().clientData)->getAllWorlds(worlds);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptController::clearWindowShell(DOMWindow* newDOMWindow, bool goingIntoPageCache)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -2634,7 +2634,7 @@
</span><span class="cx">
</span><span class="cx"> auto contents = std::make_unique<ArrayBufferContentsArray>(arrayBuffers.size());
</span><span class="cx"> Vector<Ref<DOMWrapperWorld>> worlds;
</span><del>- static_cast<JSClientData*>(exec->vm().clientData)->getAllWorlds(worlds);
</del><ins>+ static_cast<WebCoreJSClientData*>(exec->vm().clientData)->getAllWorlds(worlds);
</ins><span class="cx">
</span><span class="cx"> HashSet<JSC::ArrayBuffer*> visited;
</span><span class="cx"> for (size_t arrayBufferIndex = 0; arrayBufferIndex < arrayBuffers.size(); arrayBufferIndex++) {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSClientDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSClientData.h 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -24,26 +24,44 @@
</span><span class="cx">
</span><span class="cx"> #include "DOMWrapperWorld.h"
</span><span class="cx"> #include "WebCoreBuiltinNames.h"
</span><del>-#include "WebCoreJSBuiltins.h"
</del><span class="cx"> #include "WebCoreTypedArrayController.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><ins>+#if ENABLE(STREAMS_API)
+#include "ByteLengthQueuingStrategyBuiltinsWrapper.h"
+#include "CountQueuingStrategyBuiltinsWrapper.h"
+#include "ReadableStreamBuiltinsWrapper.h"
+#include "ReadableStreamControllerBuiltinsWrapper.h"
+#include "ReadableStreamInternalsBuiltinsWrapper.h"
+#include "ReadableStreamReaderBuiltinsWrapper.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class JSClientData : public JSC::VM::ClientData {
- WTF_MAKE_NONCOPYABLE(JSClientData); WTF_MAKE_FAST_ALLOCATED;
</del><ins>+class WebCoreJSClientData : public JSC::VM::ClientData {
+ WTF_MAKE_NONCOPYABLE(WebCoreJSClientData); WTF_MAKE_FAST_ALLOCATED;
</ins><span class="cx"> friend class VMWorldIterator;
</span><span class="cx"> friend void initNormalWorldClientData(JSC::VM*);
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- explicit JSClientData(JSC::VM& vm)
- : m_builtinFunctions(vm)
- , m_builtinNames(&vm)
</del><ins>+ explicit WebCoreJSClientData(JSC::VM& vm)
+ : m_builtinNames(&vm)
+#if ENABLE(STREAMS_API)
+ , m_readableStreamBuiltins(&vm)
+ , m_readableStreamControllerBuiltins(&vm)
+ , m_readableStreamInternalsBuiltins(&vm)
+ , m_readableStreamReaderBuiltins(&vm)
+ , m_byteLengthQueuingStrategyBuiltins(&vm)
+ , m_countQueuingStrategyBuiltins(&vm)
+#endif
</ins><span class="cx"> {
</span><ins>+#if ENABLE(STREAMS_API)
+ m_readableStreamInternalsBuiltins.exportNames();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- virtual ~JSClientData()
</del><ins>+ virtual ~WebCoreJSClientData()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_worldSet.contains(m_normalWorld.get()));
</span><span class="cx"> ASSERT(m_worldSet.size() == 1);
</span><span class="lines">@@ -76,19 +94,35 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebCoreBuiltinNames& builtinNames() { return m_builtinNames; }
</span><del>- JSBuiltinFunctions& builtinFunctions() { return m_builtinFunctions; }
</del><span class="cx">
</span><ins>+#if ENABLE(STREAMS_API)
+ ReadableStreamBuiltinsWrapper& readableStreamBuiltins() { return m_readableStreamBuiltins; }
+ ReadableStreamControllerBuiltinsWrapper& readableStreamControllerBuiltins() { return m_readableStreamControllerBuiltins; }
+ ReadableStreamInternalsBuiltinsWrapper& readableStreamInternalsBuiltins() { return m_readableStreamInternalsBuiltins; }
+ ReadableStreamReaderBuiltinsWrapper& readableStreamReaderBuiltins() { return m_readableStreamReaderBuiltins; }
+ ByteLengthQueuingStrategyBuiltinsWrapper& byteLengthQueuingStrategyBuiltins() { return m_byteLengthQueuingStrategyBuiltins; }
+ CountQueuingStrategyBuiltinsWrapper& countQueuingStrategyBuiltins() { return m_countQueuingStrategyBuiltins; }
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> HashSet<DOMWrapperWorld*> m_worldSet;
</span><span class="cx"> RefPtr<DOMWrapperWorld> m_normalWorld;
</span><span class="cx">
</span><del>- JSBuiltinFunctions m_builtinFunctions;
</del><span class="cx"> WebCoreBuiltinNames m_builtinNames;
</span><ins>+
+#if ENABLE(STREAMS_API)
+ ReadableStreamBuiltinsWrapper m_readableStreamBuiltins;
+ ReadableStreamControllerBuiltinsWrapper m_readableStreamControllerBuiltins;
+ ReadableStreamInternalsBuiltinsWrapper m_readableStreamInternalsBuiltins;
+ ReadableStreamReaderBuiltinsWrapper m_readableStreamReaderBuiltins;
+ ByteLengthQueuingStrategyBuiltinsWrapper m_byteLengthQueuingStrategyBuiltins;
+ CountQueuingStrategyBuiltinsWrapper m_countQueuingStrategyBuiltins;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline void initNormalWorldClientData(JSC::VM* vm)
</span><span class="cx"> {
</span><del>- JSClientData* webCoreJSClientData = new JSClientData(*vm);
</del><ins>+ WebCoreJSClientData* webCoreJSClientData = new WebCoreJSClientData(*vm);
</ins><span class="cx"> vm->clientData = webCoreJSClientData; // ~VM deletes this pointer.
</span><span class="cx"> webCoreJSClientData->m_normalWorld = DOMWrapperWorld::create(*vm, true);
</span><span class="cx"> vm->m_typedArrayController = adoptRef(new WebCoreTypedArrayController());
</span></span></pre></div>
<a id="trunkSourceWebCoregeneratejsbuiltinsallinone"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/generate-js-builtins-allinone (190667 => 190668)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/generate-js-builtins-allinone 2015-10-07 15:09:02 UTC (rev 190667)
+++ trunk/Source/WebCore/generate-js-builtins-allinone 2015-10-07 16:11:46 UTC (rev 190668)
</span><span class="lines">@@ -1,233 +0,0 @@
</span><del>-#!/usr/bin/python
-# Copyright (C) 2015 Canon Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-import argparse
-import filecmp
-import os
-import re
-
-singleLineCommentRegExp = re.compile(r"\/\/ @.*?\n", re.MULTILINE | re.S)
-
-def retrieveGenerationParameters(input):
- parameters = {}
- with open(input, 'r') as input_file:
- content = input_file.read()
- for match in singleLineCommentRegExp.finditer(content):
- values = content[match.start() + 4:match.end()].split('=')
- if len(values) == 1:
- parameters[values[0].strip()] = True
- elif len (values) == 2:
- parameters[values[0].strip()] = values[1].strip()
- else:
- print("Skipping potential generation parameter directive:" % values.join('='))
- return parameters
-
-
-def retrieveFilesWithParameters(inputs):
- files = []
- class FileInput: pass
- for input in inputs:
- file_input = FileInput()
- file_input.parameters = retrieveGenerationParameters(input)
- file_input.optionalif = ("#if ENABLE(" + file_input.parameters["optional"] + ")\n") if "optional" in file_input.parameters else ""
- file_input.optionalendif = "#endif\n" if "optional" in file_input.parameters else ""
- file_input.filename = os.path.splitext(os.path.basename(input))[0]
- file_input.name = file_input.filename[0].lower() + file_input.filename[1:]
- files.append(file_input)
- return files
-
-
-def writeConditional(writer, input_file, value):
- writer.write(input_file.optionalif)
- writer.write(value)
- writer.write(input_file.optionalendif)
-
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--output_dir', default='', help='output directory')
-parser.add_argument('inputs', metavar='input', nargs='+', help='path to input JS files')
-
-args = parser.parse_args()
-files = retrieveFilesWithParameters(args.inputs)
-internals_files = [ f for f in files if "internals" in f.parameters ]
-
-basename = "WebCoreJSBuiltins"
-output_base = os.path.join(args.output_dir, basename)
-private_output_base = os.path.join(args.output_dir, "Private" + basename)
-
-
-# Create writers
-builtinsHeader = open(output_base + ".h.tmp", "w")
-builtinsImplementation = open(output_base + ".cpp.tmp", "w")
-privateBuiltinsHeader = open(private_output_base + ".h.tmp", "w")
-
-preamble = """
-/* Generated by generate-js-builtins-allinone do not hand edit. */
-
-/*
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-"""
-
-###############
-# Generation of cpp file including all JS builtin generated cpp files with optional #fdef directives as defined by @enable in JS files.
-###############
-builtinsImplementation.write(preamble)
-builtinsImplementation.write("#include \"config.h\"\n\n")
-
-# Including cpp files
-for input_file in files:
- writeConditional(builtinsImplementation, input_file, "#include \"" + input_file.filename + "Builtins.cpp\"\n");
-
-builtinsImplementation.close()
-
-###############
-# Generation of wrapper header file defining access to all builtin functions.
-###############
-builtinsHeader.write(preamble)
-builtinsHeader.write("#ifndef " + basename + "_h\n#define " + basename + "_h\n\n")
-
-for input_file in files:
- writeConditional(builtinsHeader, input_file, "#include \"" + input_file.filename + "BuiltinsWrapper.h\"\n");
-builtinsHeader.write("""
-
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-class JSBuiltinFunctions {
-public:
-""")
-
-# Constructor
-builtinsHeader.write(" explicit JSBuiltinFunctions(JSC::VM& v)\n : vm(v)\n");
-for input_file in files:
- writeConditional(builtinsHeader, input_file, " , m_" + input_file.name + "Builtins(&vm)\n");
-builtinsHeader.write(" {\n");
-for input_file in internals_files:
- writeConditional(builtinsHeader, input_file, " m_" + input_file.name + "Builtins.exportNames();\n");
-builtinsHeader.write(" }\n");
-
-# Getters
-for input_file in files:
- writeConditional(builtinsHeader, input_file, " " + input_file.filename + "BuiltinsWrapper& " + input_file.name + "Builtins() { return m_" + input_file.name + "Builtins;}\n");
-
-# Declarations
-builtinsHeader.write("""private:
- JSC::VM& vm;\n""");
-for input_file in files:
- writeConditional(builtinsHeader, input_file, " " + input_file.filename + "BuiltinsWrapper m_" + input_file.name + "Builtins;\n");
-
-builtinsHeader.write("""
-};
-
-}
-
-#endif
-""");
-
-builtinsHeader.close()
-
-###############
-# Generation of class wrapping all functions of JS files marked as @internals.
-###############
-privateBuiltinsHeader.write(preamble)
-privateBuiltinsHeader.write("#ifndef Private" + basename + "_h\n#define Private" + basename + "_h\n\n")
-
-# Including all necessrary wrapper headers.
-for input_file in internals_files:
- writeConditional(privateBuiltinsHeader, input_file, "#include \"" + input_file.filename + "BuiltinsWrapper.h\"\n")
-
-# Class definition
-privateBuiltinsHeader.write("""
-namespace WebCore {
-
-class JSBuiltinInternalFunctions {
-public:
-""")
-
-# Constructor
-privateBuiltinsHeader.write("""explicit JSBuiltinInternalFunctions(JSC::VM& v)\n : vm(v)\n""")
-for input_file in internals_files:
- writeConditional(privateBuiltinsHeader, input_file, " , m_" + input_file.name + "Functions(vm)\n")
-privateBuiltinsHeader.write(" { }\n\n")
-
-# Getters
-for input_file in internals_files:
- writeConditional(privateBuiltinsHeader, input_file, " " + input_file.filename + "BuiltinFunctions " + input_file.name + "() { return m_" + input_file.name + "Functions; }\n")
-
-# Visitor wrapper routine
-privateBuiltinsHeader.write(" void visit(JSC::SlotVisitor& visitor) {\n")
-for input_file in internals_files:
- writeConditional(privateBuiltinsHeader, input_file, " m_" + input_file.name + "Functions.visit(visitor);\n")
-privateBuiltinsHeader.write(" }\n")
-
-# Init wrapper routine
-privateBuiltinsHeader.write(" void init(JSC::JSGlobalObject& globalObject) {\n")
-for input_file in internals_files:
- writeConditional(privateBuiltinsHeader, input_file, " m_" + input_file.name + "Functions.init(globalObject);\n")
-privateBuiltinsHeader.write(" }\n")
-
-# Private member fields
-privateBuiltinsHeader.write("""
-private:
- JSC::VM& vm;\n""")
-for input_file in internals_files:
- writeConditional(privateBuiltinsHeader, input_file, " " + input_file.filename + "BuiltinFunctions m_" + input_file.name + "Functions;\n")
-
-privateBuiltinsHeader.write("""
-};
-
-}
-#endif
-""")
-
-privateBuiltinsHeader.close()
-
-def copytempfile(output):
- if (not os.path.exists(output)) or (not filecmp.cmp(output + ".tmp", output, shallow=False)):
- if (os.path.exists(output)):
- os.remove(output)
- os.rename(output + ".tmp", output)
- else:
- os.remove(output + ".tmp")
-
-copytempfile(output_base + ".h")
-copytempfile(output_base + ".cpp")
-copytempfile(private_output_base + ".h")
</del></span></pre>
</div>
</div>
</body>
</html>