<!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>[191842] 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/191842">191842</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2015-10-31 09:52:39 -0700 (Sat, 31 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Builtins generator should put WebCore-only wrappers in the per-builtin header
https://bugs.webkit.org/show_bug.cgi?id=150539
Reviewed by Youenn Fablet.
Source/JavaScriptCore:
If generating for WebCore, put the XXXWrapper and related boilerplate
in the per-builtin header instead of making a separate XXXWrapper.h.
Rebaseline the tests.
* CMakeLists.txt:
* DerivedSources.make:
* Scripts/builtins/builtins.py:
* Scripts/builtins/builtins_generate_separate_header.py:
(BuiltinsSeparateHeaderGenerator.generate_output):
(generate_header_includes):
* Scripts/builtins/builtins_generate_separate_wrapper.py: Deleted.
* Scripts/builtins/builtins_templates.py: Be consistent with variables.
* Scripts/generate-js-builtins.py:
* Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
Source/WebCore:
Fix includes of removed XXXWrapper.h headers.
* CMakeLists.txt:
* DerivedSources.make:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/WebCoreJSBuiltinInternals.h:
* bindings/js/WebCoreJSBuiltins.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptsbuiltinsbuiltinspy">trunk/Source/JavaScriptCore/Scripts/builtins/builtins.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_generate_separate_headerpy">trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_templatespy">trunk/Source/JavaScriptCore/Scripts/builtins/builtins_templates.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptsgeneratejsbuiltinspy">trunk/Source/JavaScriptCore/Scripts/generate-js-builtins.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreArbitraryConditionalGuardSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedBuiltinSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedInternalBuiltinSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreUnguardedBuiltinSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result</a></li>
<li><a href="#trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCorexmlCasingTestSeparatejsresult">trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result</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="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSBuiltinInternalsh">trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsWebCoreJSBuiltinsh">trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_generate_separate_wrapperpy">trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_wrapper.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -1194,7 +1194,6 @@
</span><span class="cx"> ${JavaScriptCore_SCRIPTS_DIR}/builtins_generate_combined_implementation.py
</span><span class="cx"> ${JavaScriptCore_SCRIPTS_DIR}/builtins_generate_separate_header.py
</span><span class="cx"> ${JavaScriptCore_SCRIPTS_DIR}/builtins_generate_separate_implementation.py
</span><del>- ${JavaScriptCore_SCRIPTS_DIR}/builtins_generate_separate_wrapper.py
</del><span class="cx"> ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py
</span><span class="cx"> ${JavaScriptCore_SCRIPTS_DIR}/lazywriter.py
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-10-31 Brian Burg <bburg@apple.com>
+
+ Builtins generator should put WebCore-only wrappers in the per-builtin header
+ https://bugs.webkit.org/show_bug.cgi?id=150539
+
+ Reviewed by Youenn Fablet.
+
+ If generating for WebCore, put the XXXWrapper and related boilerplate
+ in the per-builtin header instead of making a separate XXXWrapper.h.
+
+ Rebaseline the tests.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * Scripts/builtins/builtins.py:
+ * Scripts/builtins/builtins_generate_separate_header.py:
+ (BuiltinsSeparateHeaderGenerator.generate_output):
+ (generate_header_includes):
+ * Scripts/builtins/builtins_generate_separate_wrapper.py: Deleted.
+ * Scripts/builtins/builtins_templates.py: Be consistent with variables.
+ * Scripts/generate-js-builtins.py:
+ * Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result:
+ * Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
+
</ins><span class="cx"> 2015-10-31 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> JSC should have a forceGCSlowPaths option
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/DerivedSources.make 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx"> $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_combined_implementation.py \
</span><span class="cx"> $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_separate_header.py \
</span><span class="cx"> $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_separate_implementation.py \
</span><del>- $(JavaScriptCore_SCRIPTS_DIR)/builtins/builtins_generate_separate_wrapper.py \
</del><span class="cx"> $(JavaScriptCore_SCRIPTS_DIR)/generate-js-builtins.py \
</span><span class="cx"> $(JavaScriptCore_SCRIPTS_DIR)/lazywriter.py \
</span><span class="cx"> #
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -1372,7 +1372,6 @@
</span><span class="cx"> 99DA00A81BD5993100F4575C /* builtins_generate_combined_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 99DA00A91BD5993100F4575C /* builtins_generate_separate_header.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00A01BD5992700F4575C /* builtins_generate_separate_header.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 99DA00AA1BD5993100F4575C /* builtins_generate_separate_implementation.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00A11BD5992700F4575C /* builtins_generate_separate_implementation.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 99DA00AB1BD5993100F4575C /* builtins_generate_separate_wrapper.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00A21BD5992700F4575C /* builtins_generate_separate_wrapper.py */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 99DA00AF1BD5994E00F4575C /* generate-js-builtins.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00AC1BD5993E00F4575C /* generate-js-builtins.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 99DA00B01BD5994E00F4575C /* lazywriter.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00AD1BD5993E00F4575C /* lazywriter.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 99DA00B11BD5994E00F4575C /* UpdateContents.py in Headers */ = {isa = PBXBuildFile; fileRef = 99DA00AE1BD5993E00F4575C /* UpdateContents.py */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -3432,7 +3431,6 @@
</span><span class="cx"> 99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_combined_implementation.py; sourceTree = "<group>"; };
</span><span class="cx"> 99DA00A01BD5992700F4575C /* builtins_generate_separate_header.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_separate_header.py; sourceTree = "<group>"; };
</span><span class="cx"> 99DA00A11BD5992700F4575C /* builtins_generate_separate_implementation.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_separate_implementation.py; sourceTree = "<group>"; };
</span><del>- 99DA00A21BD5992700F4575C /* builtins_generate_separate_wrapper.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = builtins_generate_separate_wrapper.py; sourceTree = "<group>"; };
</del><span class="cx"> 99DA00AC1BD5993E00F4575C /* generate-js-builtins.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "generate-js-builtins.py"; sourceTree = "<group>"; };
</span><span class="cx"> 99DA00AD1BD5993E00F4575C /* lazywriter.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = lazywriter.py; sourceTree = "<group>"; };
</span><span class="cx"> 99DA00AE1BD5993E00F4575C /* UpdateContents.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = UpdateContents.py; sourceTree = "<group>"; };
</span><span class="lines">@@ -6232,7 +6230,6 @@
</span><span class="cx"> 99DA009F1BD5992700F4575C /* builtins_generate_combined_implementation.py */,
</span><span class="cx"> 99DA00A01BD5992700F4575C /* builtins_generate_separate_header.py */,
</span><span class="cx"> 99DA00A11BD5992700F4575C /* builtins_generate_separate_implementation.py */,
</span><del>- 99DA00A21BD5992700F4575C /* builtins_generate_separate_wrapper.py */,
</del><span class="cx"> 99DA009A1BD5992700F4575C /* builtins_generator.py */,
</span><span class="cx"> 99DA009B1BD5992700F4575C /* builtins_model.py */,
</span><span class="cx"> 99DA009C1BD5992700F4575C /* builtins_templates.py */,
</span><span class="lines">@@ -6542,7 +6539,6 @@
</span><span class="cx"> 99DA00A81BD5993100F4575C /* builtins_generate_combined_implementation.py in Headers */,
</span><span class="cx"> 99DA00A91BD5993100F4575C /* builtins_generate_separate_header.py in Headers */,
</span><span class="cx"> 99DA00AA1BD5993100F4575C /* builtins_generate_separate_implementation.py in Headers */,
</span><del>- 99DA00AB1BD5993100F4575C /* builtins_generate_separate_wrapper.py in Headers */,
</del><span class="cx"> 99DA00A31BD5993100F4575C /* builtins_generator.py in Headers */,
</span><span class="cx"> 99DA00A41BD5993100F4575C /* builtins_model.py in Headers */,
</span><span class="cx"> 99DA00A51BD5993100F4575C /* builtins_templates.py in Headers */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptsbuiltinsbuiltinspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/builtins/builtins.py (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/builtins/builtins.py 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/Scripts/builtins/builtins.py 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -9,4 +9,3 @@
</span><span class="cx"> from builtins_generate_combined_implementation import *
</span><span class="cx"> from builtins_generate_separate_header import *
</span><span class="cx"> from builtins_generate_separate_implementation import *
</span><del>-from builtins_generate_separate_wrapper import *
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_generate_separate_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_header.py 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> from string import Template
</span><span class="cx">
</span><span class="cx"> from builtins_generator import BuiltinsGenerator
</span><ins>+from builtins_model import Frameworks
</ins><span class="cx"> from builtins_templates import BuiltinsGeneratorTemplates as Templates
</span><span class="cx">
</span><span class="cx"> log = logging.getLogger('global')
</span><span class="lines">@@ -52,7 +53,8 @@
</span><span class="cx"> 'namespace': self.model().framework.setting('namespace'),
</span><span class="cx"> 'headerGuard': self.output_filename().replace('.', '_'),
</span><span class="cx"> 'macroPrefix': self.macro_prefix(),
</span><del>- 'objectName': self.object.object_name.upper(),
</del><ins>+ 'objectName': self.object.object_name,
+ 'objectMacro': self.object.object_name.upper(),
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> conditional_guard = self.object.annotations.get('conditional')
</span><span class="lines">@@ -70,6 +72,8 @@
</span><span class="cx"> sections.append(self.generate_section_for_code_table_macro())
</span><span class="cx"> sections.append(self.generate_section_for_code_name_macro())
</span><span class="cx"> sections.append(Template(Templates.SeparateHeaderStaticMacros).substitute(args))
</span><ins>+ if self.model().framework is Frameworks.WebCore:
+ sections.append(Template(Templates.SeparateHeaderWrapperBoilerplate).substitute(args))
</ins><span class="cx"> sections.append(Template(Templates.NamespaceBottom).substitute(args))
</span><span class="cx"> if conditional_guard is not None:
</span><span class="cx"> sections.append("#endif // %s" % conditional_guard)
</span><span class="lines">@@ -85,8 +89,20 @@
</span><span class="cx"> def generate_secondary_header_includes(self):
</span><span class="cx"> header_includes = [
</span><span class="cx"> (["WebCore"],
</span><ins>+ ("JavaScriptCore", "bytecode/UnlinkedFunctionExecutable.h"),
+ ),
+
+ (["WebCore"],
</ins><span class="cx"> ("JavaScriptCore", "builtins/BuiltinUtils.h"),
</span><span class="cx"> ),
</span><ins>+
+ (["WebCore"],
+ ("JavaScriptCore", "runtime/Identifier.h"),
+ ),
+
+ (["WebCore"],
+ ("JavaScriptCore", "runtime/JSFunction.h"),
+ ),
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> return '\n'.join(self.generate_includes_from_entries(header_includes))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_generate_separate_wrapperpy"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_wrapper.py (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_wrapper.py 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/Scripts/builtins/builtins_generate_separate_wrapper.py 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -1,100 +0,0 @@
</span><del>-#!/usr/bin/env python
-#
-# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
-# Copyright (c) 2014 University of Washington. 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. AND ITS CONTRIBUTORS ``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 ITS 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 logging
-import re
-import string
-from string import Template
-
-from builtins_generator import BuiltinsGenerator
-from builtins_templates import BuiltinsGeneratorTemplates as Templates
-
-log = logging.getLogger('global')
-
-
-class BuiltinsSeparateWrapperGenerator(BuiltinsGenerator):
- def __init__(self, model, object):
- BuiltinsGenerator.__init__(self, model)
- self.object = object
-
- def output_filename(self):
- return "%sBuiltinsWrapper.h" % BuiltinsGenerator.mangledNameForObject(self.object)
-
- def macro_prefix(self):
- return self.model().framework.setting('macro_prefix')
-
- def generate_output(self):
- args = {
- 'namespace': self.model().framework.setting('namespace'),
- 'headerGuard': self.output_filename().replace('.', '_'),
- 'macroPrefix': self.macro_prefix(),
- 'objectName': self.object.object_name,
- 'objectMacro': self.object.object_name.upper(),
- }
-
- conditional_guard = self.object.annotations.get('conditional')
-
- sections = []
- sections.append(self.generate_license())
- sections.append(Template(Templates.DoNotEditWarning).substitute(args))
- sections.append(Template(Templates.HeaderIncludeGuardTop).substitute(args))
- if conditional_guard is not None:
- sections.append("#if %s" % conditional_guard)
- sections.append(self.generate_secondary_header_includes())
- sections.append(Template(Templates.NamespaceTop).substitute(args))
- sections.append(Template(Templates.SeparateWrapperHeaderBoilerplate).substitute(args))
- sections.append(Template(Templates.NamespaceBottom).substitute(args))
- if conditional_guard is not None:
- sections.append("#endif // %s" % conditional_guard)
- sections.append(Template(Templates.HeaderIncludeGuardBottom).substitute(args))
-
- return "\n\n".join(sections)
-
- def generate_secondary_header_includes(self):
- header_includes = [
- (["WebCore"],
- ("WebCore", "%sBuiltins.h" % self.object.object_name),
- ),
-
- (["WebCore"],
- ("JavaScriptCore", "bytecode/UnlinkedFunctionExecutable.h"),
- ),
-
- (["WebCore"],
- ("JavaScriptCore", "builtins/BuiltinUtils.h"),
- ),
-
- (["WebCore"],
- ("JavaScriptCore", "runtime/Identifier.h"),
- ),
-
- (["WebCore"],
- ("JavaScriptCore", "runtime/JSFunction.h"),
- ),
- ]
-
- return '\n'.join(self.generate_includes_from_entries(header_includes))
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptsbuiltinsbuiltins_templatespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/builtins/builtins_templates.py (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/builtins/builtins_templates.py 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/Scripts/builtins/builtins_templates.py 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -83,10 +83,10 @@
</span><span class="cx"> """#define DECLARE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \\
</span><span class="cx"> JSC::FunctionExecutable* codeName##Generator(JSC::VM&);
</span><span class="cx">
</span><del>-${macroPrefix}_FOREACH_${objectName}_BUILTIN_CODE(DECLARE_BUILTIN_GENERATOR)
</del><ins>+${macroPrefix}_FOREACH_${objectMacro}_BUILTIN_CODE(DECLARE_BUILTIN_GENERATOR)
</ins><span class="cx"> #undef DECLARE_BUILTIN_GENERATOR
</span><span class="cx">
</span><del>-#define ${macroPrefix}_BUILTIN_${objectName}_EXISTS(object, func) defined ${macroPrefix}_BUILTIN_ ## object ## _ ## func""")
</del><ins>+#define ${macroPrefix}_BUILTIN_${objectMacro}_EXISTS(object, func) defined ${macroPrefix}_BUILTIN_ ## object ## _ ## func""")
</ins><span class="cx">
</span><span class="cx"> CombinedJSCImplementationStaticMacros = (
</span><span class="cx"> """
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> #undef DEFINE_BUILTIN_GENERATOR
</span><span class="cx"> """)
</span><span class="cx">
</span><del>- SeparateWrapperHeaderBoilerplate = (
</del><ins>+ SeparateHeaderWrapperBoilerplate = (
</ins><span class="cx"> """class ${objectName}BuiltinsWrapper : private JSC::WeakHandleOwner {
</span><span class="cx"> public:
</span><span class="cx"> explicit ${objectName}BuiltinsWrapper(JSC::VM* vm)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptsgeneratejsbuiltinspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/generate-js-builtins.py (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/generate-js-builtins.py 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/Scripts/generate-js-builtins.py 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -74,9 +74,6 @@
</span><span class="cx"> generators.append(BuiltinsSeparateHeaderGenerator(model, object))
</span><span class="cx"> generators.append(BuiltinsSeparateImplementationGenerator(model, object))
</span><span class="cx">
</span><del>- if model.framework is Frameworks.WebCore:
- generators.append(BuiltinsSeparateWrapperGenerator(model, object))
-
</del><span class="cx"> log.debug("")
</span><span class="cx"> log.debug("Generating bindings for builtins.")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreArbitraryConditionalGuardSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -34,6 +34,9 @@
</span><span class="cx"> #if ENABLE(STREAMS_API) || USE(CF)
</span><span class="cx">
</span><span class="cx"> #include <builtins/BuiltinUtils.h>
</span><ins>+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx"> class FunctionExecutable;
</span><span class="lines">@@ -65,129 +68,6 @@
</span><span class="cx">
</span><span class="cx"> #define WEBCORE_BUILTIN_ARBITRARYCONDITIONALGUARD_EXISTS(object, func) defined WEBCORE_BUILTIN_ ## object ## _ ## func
</span><span class="cx">
</span><del>-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API) || USE(CF)
-
-#endif // ArbitraryConditionalGuardBuiltins_h
-
-### End File: ArbitraryConditionalGuardBuiltins.h
-
-### Begin File: ArbitraryConditionalGuardBuiltins.cpp
-/*
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
-// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
-
-#include "config.h"
-#include "ArbitraryConditionalGuardBuiltins.h"
-
-#if ENABLE(STREAMS_API) || USE(CF)
-
-#include "WebCoreJSClientData.h"
-#include <runtime/Executable.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/JSCellInlines.h>
-#include <runtime/StructureInlines.h>
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-const JSC::ConstructAbility s_arbitraryConditionalGuardIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
-const int s_arbitraryConditionalGuardIsReadableStreamLockedCodeLength = 71;
-const char* s_arbitraryConditionalGuardIsReadableStreamLockedCode =
- "(function (stream)\n" \
- "{\n" \
- " \"use strict\";\n" \
- "\n" \
- " return !!stream.@reader;\n" \
- "})\n" \
-;
-
-
-#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
-JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
-{\
- JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
- return clientData->builtinFunctions().arbitraryConditionalGuardBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().arbitraryConditionalGuardBuiltins().codeName##Source()); \
-}
-WEBCORE_FOREACH_ARBITRARYCONDITIONALGUARD_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
-#undef DEFINE_BUILTIN_GENERATOR
-
-
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API) || USE(CF)
-
-### End File: ArbitraryConditionalGuardBuiltins.cpp
-
-### Begin File: ArbitraryConditionalGuardBuiltinsWrapper.h
-/*
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
-// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
-
-#ifndef ArbitraryConditionalGuardBuiltinsWrapper_h
-#define ArbitraryConditionalGuardBuiltinsWrapper_h
-
-#if ENABLE(STREAMS_API) || USE(CF)
-
-#include "ArbitraryConditionalGuardBuiltins.h"
-#include <builtins/BuiltinUtils.h>
-#include <bytecode/UnlinkedFunctionExecutable.h>
-#include <runtime/Identifier.h>
-#include <runtime/JSFunction.h>
-
-namespace WebCore {
-
</del><span class="cx"> class ArbitraryConditionalGuardBuiltinsWrapper : private JSC::WeakHandleOwner {
</span><span class="cx"> public:
</span><span class="cx"> explicit ArbitraryConditionalGuardBuiltinsWrapper(JSC::VM* vm)
</span><span class="lines">@@ -275,6 +155,78 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(STREAMS_API) || USE(CF)
</span><span class="cx">
</span><del>-#endif // ArbitraryConditionalGuardBuiltinsWrapper_h
</del><ins>+#endif // ArbitraryConditionalGuardBuiltins_h
</ins><span class="cx">
</span><del>-### End File: ArbitraryConditionalGuardBuiltinsWrapper.h
</del><ins>+### End File: ArbitraryConditionalGuardBuiltins.h
+
+### Begin File: ArbitraryConditionalGuardBuiltins.cpp
+/*
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ *
+ */
+
+// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
+// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
+
+#include "config.h"
+#include "ArbitraryConditionalGuardBuiltins.h"
+
+#if ENABLE(STREAMS_API) || USE(CF)
+
+#include "WebCoreJSClientData.h"
+#include <runtime/Executable.h>
+#include <runtime/JSCJSValueInlines.h>
+#include <runtime/JSCellInlines.h>
+#include <runtime/StructureInlines.h>
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+const JSC::ConstructAbility s_arbitraryConditionalGuardIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
+const int s_arbitraryConditionalGuardIsReadableStreamLockedCodeLength = 71;
+const char* s_arbitraryConditionalGuardIsReadableStreamLockedCode =
+ "(function (stream)\n" \
+ "{\n" \
+ " \"use strict\";\n" \
+ "\n" \
+ " return !!stream.@reader;\n" \
+ "})\n" \
+;
+
+
+#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
+JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
+{\
+ JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
+ return clientData->builtinFunctions().arbitraryConditionalGuardBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().arbitraryConditionalGuardBuiltins().codeName##Source()); \
+}
+WEBCORE_FOREACH_ARBITRARYCONDITIONALGUARD_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
+#undef DEFINE_BUILTIN_GENERATOR
+
+
+} // namespace WebCore
+
+#endif // ENABLE(STREAMS_API) || USE(CF)
+
+### End File: ArbitraryConditionalGuardBuiltins.cpp
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedBuiltinSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -34,6 +34,9 @@
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx">
</span><span class="cx"> #include <builtins/BuiltinUtils.h>
</span><ins>+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx"> class FunctionExecutable;
</span><span class="lines">@@ -65,129 +68,6 @@
</span><span class="cx">
</span><span class="cx"> #define WEBCORE_BUILTIN_GUARDEDBUILTIN_EXISTS(object, func) defined WEBCORE_BUILTIN_ ## object ## _ ## func
</span><span class="cx">
</span><del>-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API)
-
-#endif // GuardedBuiltinBuiltins_h
-
-### End File: GuardedBuiltinBuiltins.h
-
-### Begin File: GuardedBuiltinBuiltins.cpp
-/*
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
-// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
-
-#include "config.h"
-#include "GuardedBuiltinBuiltins.h"
-
-#if ENABLE(STREAMS_API)
-
-#include "WebCoreJSClientData.h"
-#include <runtime/Executable.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/JSCellInlines.h>
-#include <runtime/StructureInlines.h>
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-const JSC::ConstructAbility s_guardedBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
-const int s_guardedBuiltinIsReadableStreamLockedCodeLength = 71;
-const char* s_guardedBuiltinIsReadableStreamLockedCode =
- "(function (stream)\n" \
- "{\n" \
- " \"use strict\";\n" \
- "\n" \
- " return !!stream.@reader;\n" \
- "})\n" \
-;
-
-
-#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
-JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
-{\
- JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
- return clientData->builtinFunctions().guardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedBuiltinBuiltins().codeName##Source()); \
-}
-WEBCORE_FOREACH_GUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
-#undef DEFINE_BUILTIN_GENERATOR
-
-
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API)
-
-### End File: GuardedBuiltinBuiltins.cpp
-
-### Begin File: GuardedBuiltinBuiltinsWrapper.h
-/*
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
-// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
-
-#ifndef GuardedBuiltinBuiltinsWrapper_h
-#define GuardedBuiltinBuiltinsWrapper_h
-
-#if ENABLE(STREAMS_API)
-
-#include "GuardedBuiltinBuiltins.h"
-#include <builtins/BuiltinUtils.h>
-#include <bytecode/UnlinkedFunctionExecutable.h>
-#include <runtime/Identifier.h>
-#include <runtime/JSFunction.h>
-
-namespace WebCore {
-
</del><span class="cx"> class GuardedBuiltinBuiltinsWrapper : private JSC::WeakHandleOwner {
</span><span class="cx"> public:
</span><span class="cx"> explicit GuardedBuiltinBuiltinsWrapper(JSC::VM* vm)
</span><span class="lines">@@ -275,6 +155,78 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><span class="cx">
</span><del>-#endif // GuardedBuiltinBuiltinsWrapper_h
</del><ins>+#endif // GuardedBuiltinBuiltins_h
</ins><span class="cx">
</span><del>-### End File: GuardedBuiltinBuiltinsWrapper.h
</del><ins>+### End File: GuardedBuiltinBuiltins.h
+
+### Begin File: GuardedBuiltinBuiltins.cpp
+/*
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ *
+ */
+
+// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
+// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
+
+#include "config.h"
+#include "GuardedBuiltinBuiltins.h"
+
+#if ENABLE(STREAMS_API)
+
+#include "WebCoreJSClientData.h"
+#include <runtime/Executable.h>
+#include <runtime/JSCJSValueInlines.h>
+#include <runtime/JSCellInlines.h>
+#include <runtime/StructureInlines.h>
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+const JSC::ConstructAbility s_guardedBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
+const int s_guardedBuiltinIsReadableStreamLockedCodeLength = 71;
+const char* s_guardedBuiltinIsReadableStreamLockedCode =
+ "(function (stream)\n" \
+ "{\n" \
+ " \"use strict\";\n" \
+ "\n" \
+ " return !!stream.@reader;\n" \
+ "})\n" \
+;
+
+
+#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
+JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
+{\
+ JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
+ return clientData->builtinFunctions().guardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedBuiltinBuiltins().codeName##Source()); \
+}
+WEBCORE_FOREACH_GUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
+#undef DEFINE_BUILTIN_GENERATOR
+
+
+} // namespace WebCore
+
+#endif // ENABLE(STREAMS_API)
+
+### End File: GuardedBuiltinBuiltins.cpp
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedInternalBuiltinSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -34,6 +34,9 @@
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx">
</span><span class="cx"> #include <builtins/BuiltinUtils.h>
</span><ins>+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx"> class FunctionExecutable;
</span><span class="lines">@@ -65,129 +68,6 @@
</span><span class="cx">
</span><span class="cx"> #define WEBCORE_BUILTIN_GUARDEDINTERNALBUILTIN_EXISTS(object, func) defined WEBCORE_BUILTIN_ ## object ## _ ## func
</span><span class="cx">
</span><del>-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API)
-
-#endif // GuardedInternalBuiltinBuiltins_h
-
-### End File: GuardedInternalBuiltinBuiltins.h
-
-### Begin File: GuardedInternalBuiltinBuiltins.cpp
-/*
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
-// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
-
-#include "config.h"
-#include "GuardedInternalBuiltinBuiltins.h"
-
-#if ENABLE(STREAMS_API)
-
-#include "WebCoreJSClientData.h"
-#include <runtime/Executable.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/JSCellInlines.h>
-#include <runtime/StructureInlines.h>
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-const JSC::ConstructAbility s_guardedInternalBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
-const int s_guardedInternalBuiltinIsReadableStreamLockedCodeLength = 71;
-const char* s_guardedInternalBuiltinIsReadableStreamLockedCode =
- "(function (stream)\n" \
- "{\n" \
- " \"use strict\";\n" \
- "\n" \
- " return !!stream.@reader;\n" \
- "})\n" \
-;
-
-
-#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
-JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
-{\
- JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
- return clientData->builtinFunctions().guardedInternalBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedInternalBuiltinBuiltins().codeName##Source()); \
-}
-WEBCORE_FOREACH_GUARDEDINTERNALBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
-#undef DEFINE_BUILTIN_GENERATOR
-
-
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API)
-
-### End File: GuardedInternalBuiltinBuiltins.cpp
-
-### Begin File: GuardedInternalBuiltinBuiltinsWrapper.h
-/*
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
-// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
-
-#ifndef GuardedInternalBuiltinBuiltinsWrapper_h
-#define GuardedInternalBuiltinBuiltinsWrapper_h
-
-#if ENABLE(STREAMS_API)
-
-#include "GuardedInternalBuiltinBuiltins.h"
-#include <builtins/BuiltinUtils.h>
-#include <bytecode/UnlinkedFunctionExecutable.h>
-#include <runtime/Identifier.h>
-#include <runtime/JSFunction.h>
-
-namespace WebCore {
-
</del><span class="cx"> class GuardedInternalBuiltinBuiltinsWrapper : private JSC::WeakHandleOwner {
</span><span class="cx"> public:
</span><span class="cx"> explicit GuardedInternalBuiltinBuiltinsWrapper(JSC::VM* vm)
</span><span class="lines">@@ -275,6 +155,78 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><span class="cx">
</span><del>-#endif // GuardedInternalBuiltinBuiltinsWrapper_h
</del><ins>+#endif // GuardedInternalBuiltinBuiltins_h
</ins><span class="cx">
</span><del>-### End File: GuardedInternalBuiltinBuiltinsWrapper.h
</del><ins>+### End File: GuardedInternalBuiltinBuiltins.h
+
+### Begin File: GuardedInternalBuiltinBuiltins.cpp
+/*
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ *
+ */
+
+// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
+// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
+
+#include "config.h"
+#include "GuardedInternalBuiltinBuiltins.h"
+
+#if ENABLE(STREAMS_API)
+
+#include "WebCoreJSClientData.h"
+#include <runtime/Executable.h>
+#include <runtime/JSCJSValueInlines.h>
+#include <runtime/JSCellInlines.h>
+#include <runtime/StructureInlines.h>
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+const JSC::ConstructAbility s_guardedInternalBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
+const int s_guardedInternalBuiltinIsReadableStreamLockedCodeLength = 71;
+const char* s_guardedInternalBuiltinIsReadableStreamLockedCode =
+ "(function (stream)\n" \
+ "{\n" \
+ " \"use strict\";\n" \
+ "\n" \
+ " return !!stream.@reader;\n" \
+ "})\n" \
+;
+
+
+#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
+JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
+{\
+ JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
+ return clientData->builtinFunctions().guardedInternalBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().guardedInternalBuiltinBuiltins().codeName##Source()); \
+}
+WEBCORE_FOREACH_GUARDEDINTERNALBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
+#undef DEFINE_BUILTIN_GENERATOR
+
+
+} // namespace WebCore
+
+#endif // ENABLE(STREAMS_API)
+
+### End File: GuardedInternalBuiltinBuiltins.cpp
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreUnguardedBuiltinSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -32,6 +32,9 @@
</span><span class="cx"> #define UnguardedBuiltinBuiltins_h
</span><span class="cx">
</span><span class="cx"> #include <builtins/BuiltinUtils.h>
</span><ins>+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx"> class FunctionExecutable;
</span><span class="lines">@@ -63,120 +66,6 @@
</span><span class="cx">
</span><span class="cx"> #define WEBCORE_BUILTIN_UNGUARDEDBUILTIN_EXISTS(object, func) defined WEBCORE_BUILTIN_ ## object ## _ ## func
</span><span class="cx">
</span><del>-} // namespace WebCore
-
-#endif // UnguardedBuiltinBuiltins_h
-
-### End File: UnguardedBuiltinBuiltins.h
-
-### Begin File: UnguardedBuiltinBuiltins.cpp
-/*
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
-// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
-
-#include "config.h"
-#include "UnguardedBuiltinBuiltins.h"
-
-#include "WebCoreJSClientData.h"
-#include <runtime/Executable.h>
-#include <runtime/JSCJSValueInlines.h>
-#include <runtime/JSCellInlines.h>
-#include <runtime/StructureInlines.h>
-#include <runtime/VM.h>
-
-namespace WebCore {
-
-const JSC::ConstructAbility s_unguardedBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
-const int s_unguardedBuiltinIsReadableStreamLockedCodeLength = 71;
-const char* s_unguardedBuiltinIsReadableStreamLockedCode =
- "(function (stream)\n" \
- "{\n" \
- " \"use strict\";\n" \
- "\n" \
- " return !!stream.@reader;\n" \
- "})\n" \
-;
-
-
-#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
-JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
-{\
- JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
- return clientData->builtinFunctions().unguardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().unguardedBuiltinBuiltins().codeName##Source()); \
-}
-WEBCORE_FOREACH_UNGUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
-#undef DEFINE_BUILTIN_GENERATOR
-
-
-} // namespace WebCore
-### End File: UnguardedBuiltinBuiltins.cpp
-
-### Begin File: UnguardedBuiltinBuiltinsWrapper.h
-/*
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
-// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
-
-#ifndef UnguardedBuiltinBuiltinsWrapper_h
-#define UnguardedBuiltinBuiltinsWrapper_h
-
-#include "UnguardedBuiltinBuiltins.h"
-#include <builtins/BuiltinUtils.h>
-#include <bytecode/UnlinkedFunctionExecutable.h>
-#include <runtime/Identifier.h>
-#include <runtime/JSFunction.h>
-
-namespace WebCore {
-
</del><span class="cx"> class UnguardedBuiltinBuiltinsWrapper : private JSC::WeakHandleOwner {
</span><span class="cx"> public:
</span><span class="cx"> explicit UnguardedBuiltinBuiltinsWrapper(JSC::VM* vm)
</span><span class="lines">@@ -262,6 +151,73 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // UnguardedBuiltinBuiltinsWrapper_h
</del><ins>+#endif // UnguardedBuiltinBuiltins_h
</ins><span class="cx">
</span><del>-### End File: UnguardedBuiltinBuiltinsWrapper.h
</del><ins>+### End File: UnguardedBuiltinBuiltins.h
+
+### Begin File: UnguardedBuiltinBuiltins.cpp
+/*
+ * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
+ *
+ */
+
+// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
+// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
+
+#include "config.h"
+#include "UnguardedBuiltinBuiltins.h"
+
+#include "WebCoreJSClientData.h"
+#include <runtime/Executable.h>
+#include <runtime/JSCJSValueInlines.h>
+#include <runtime/JSCellInlines.h>
+#include <runtime/StructureInlines.h>
+#include <runtime/VM.h>
+
+namespace WebCore {
+
+const JSC::ConstructAbility s_unguardedBuiltinIsReadableStreamLockedCodeConstructAbility = JSC::ConstructAbility::CannotConstruct;
+const int s_unguardedBuiltinIsReadableStreamLockedCodeLength = 71;
+const char* s_unguardedBuiltinIsReadableStreamLockedCode =
+ "(function (stream)\n" \
+ "{\n" \
+ " \"use strict\";\n" \
+ "\n" \
+ " return !!stream.@reader;\n" \
+ "})\n" \
+;
+
+
+#define DEFINE_BUILTIN_GENERATOR(codeName, functionName, argumentCount) \
+JSC::FunctionExecutable* codeName##Generator(JSC::VM& vm) \
+{\
+ JSVMClientData* clientData = static_cast<JSVMClientData*>(vm.clientData); \
+ return clientData->builtinFunctions().unguardedBuiltinBuiltins().codeName##Executable()->link(vm, clientData->builtinFunctions().unguardedBuiltinBuiltins().codeName##Source()); \
+}
+WEBCORE_FOREACH_UNGUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
+#undef DEFINE_BUILTIN_GENERATOR
+
+
+} // namespace WebCore
+### End File: UnguardedBuiltinBuiltins.cpp
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCorexmlCasingTestSeparatejsresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -34,6 +34,9 @@
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><span class="cx">
</span><span class="cx"> #include <builtins/BuiltinUtils.h>
</span><ins>+#include <bytecode/UnlinkedFunctionExecutable.h>
+#include <runtime/Identifier.h>
+#include <runtime/JSFunction.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx"> class FunctionExecutable;
</span><span class="lines">@@ -79,6 +82,89 @@
</span><span class="cx">
</span><span class="cx"> #define WEBCORE_BUILTIN_XMLCASINGTEST_EXISTS(object, func) defined WEBCORE_BUILTIN_ ## object ## _ ## func
</span><span class="cx">
</span><ins>+class xmlCasingTestBuiltinsWrapper : private JSC::WeakHandleOwner {
+public:
+ explicit xmlCasingTestBuiltinsWrapper(JSC::VM* vm)
+ : m_vm(*vm)
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(INITIALIZE_BUILTIN_NAMES)
+#define INITIALIZE_BUILTIN_SOURCE_MEMBERS(name, functionName, length) , m_##name##Source(JSC::makeSource(StringImpl::createFromLiteral(s_##name, length)))
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(INITIALIZE_BUILTIN_SOURCE_MEMBERS)
+#undef INITIALIZE_BUILTIN_SOURCE_MEMBERS
+ {
+ }
+
+#define EXPOSE_BUILTIN_EXECUTABLES(name, functionName, length) \
+ JSC::UnlinkedFunctionExecutable* name##Executable(); \
+ const JSC::SourceCode& name##Source() const { return m_##name##Source; }
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(EXPOSE_BUILTIN_EXECUTABLES)
+#undef EXPOSE_BUILTIN_EXECUTABLES
+
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_IDENTIFIER_ACCESSOR)
+
+ void exportNames();
+
+private:
+ JSC::VM& m_vm;
+
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_NAMES)
+
+#define DECLARE_BUILTIN_SOURCE_MEMBERS(name, functionName, length) \
+ JSC::SourceCode m_##name##Source;\
+ JSC::Weak<JSC::UnlinkedFunctionExecutable> m_##name##Executable;
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(DECLARE_BUILTIN_SOURCE_MEMBERS)
+#undef DECLARE_BUILTIN_SOURCE_MEMBERS
+
+};
+
+#define DEFINE_BUILTIN_EXECUTABLES(name, functionName, length) \
+inline JSC::UnlinkedFunctionExecutable* xmlCasingTestBuiltinsWrapper::name##Executable() \
+{\
+ if (!m_##name##Executable)\
+ m_##name##Executable = JSC::Weak<JSC::UnlinkedFunctionExecutable>(JSC::createBuiltinExecutable(m_vm, m_##name##Source, functionName##PublicName(), s_##name##ConstructAbility), this, &m_##name##Executable);\
+ return m_##name##Executable.get();\
+}
+WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(DEFINE_BUILTIN_EXECUTABLES)
+#undef DEFINE_BUILTIN_EXECUTABLES
+
+inline void xmlCasingTestBuiltinsWrapper::exportNames()
+{
+#define EXPORT_FUNCTION_NAME(name) m_vm.propertyNames->appendExternalName(name##PublicName(), name##PrivateName());
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(EXPORT_FUNCTION_NAME)
+#undef EXPORT_FUNCTION_NAME
+}
+
+class xmlCasingTestBuiltinFunctions {
+public:
+ explicit xmlCasingTestBuiltinFunctions(JSC::VM& vm) : m_vm(vm) { }
+
+ void init(JSC::JSGlobalObject&);
+ void visit(JSC::SlotVisitor&);
+
+public:
+ JSC::VM& m_vm;
+
+#define DECLARE_BUILTIN_SOURCE_MEMBERS(functionName) \
+ JSC::WriteBarrier<JSC::JSFunction> m_##functionName##Function;
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_SOURCE_MEMBERS)
+#undef DECLARE_BUILTIN_SOURCE_MEMBERS
+};
+
+inline void xmlCasingTestBuiltinFunctions::init(JSC::JSGlobalObject& globalObject)
+{
+#define EXPORT_FUNCTION(codeName, functionName, length)\
+ m_##functionName##Function.set(m_vm, &globalObject, JSC::JSFunction::createBuiltinFunction(m_vm, codeName##Generator(m_vm), &globalObject));
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(EXPORT_FUNCTION)
+#undef EXPORT_FUNCTION
+}
+
+inline void xmlCasingTestBuiltinFunctions::visit(JSC::SlotVisitor& visitor)
+{
+#define VISIT_FUNCTION(name) visitor.append(&m_##name##Function);
+ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(VISIT_FUNCTION)
+#undef VISIT_FUNCTION
+}
+
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><span class="lines">@@ -195,137 +281,3 @@
</span><span class="cx"> #endif // ENABLE(STREAMS_API)
</span><span class="cx">
</span><span class="cx"> ### End File: xmlCasingTestBuiltins.cpp
</span><del>-
-### Begin File: xmlCasingTestBuiltinsWrapper.h
-/*
- * 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- *
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from JavaScript files for
-// builtins by the script: Source/JavaScriptCore/Scripts/generate-js-builtins.py
-
-#ifndef xmlCasingTestBuiltinsWrapper_h
-#define xmlCasingTestBuiltinsWrapper_h
-
-#if ENABLE(STREAMS_API)
-
-#include "xmlCasingTestBuiltins.h"
-#include <builtins/BuiltinUtils.h>
-#include <bytecode/UnlinkedFunctionExecutable.h>
-#include <runtime/Identifier.h>
-#include <runtime/JSFunction.h>
-
-namespace WebCore {
-
-class xmlCasingTestBuiltinsWrapper : private JSC::WeakHandleOwner {
-public:
- explicit xmlCasingTestBuiltinsWrapper(JSC::VM* vm)
- : m_vm(*vm)
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(INITIALIZE_BUILTIN_NAMES)
-#define INITIALIZE_BUILTIN_SOURCE_MEMBERS(name, functionName, length) , m_##name##Source(JSC::makeSource(StringImpl::createFromLiteral(s_##name, length)))
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(INITIALIZE_BUILTIN_SOURCE_MEMBERS)
-#undef INITIALIZE_BUILTIN_SOURCE_MEMBERS
- {
- }
-
-#define EXPOSE_BUILTIN_EXECUTABLES(name, functionName, length) \
- JSC::UnlinkedFunctionExecutable* name##Executable(); \
- const JSC::SourceCode& name##Source() const { return m_##name##Source; }
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(EXPOSE_BUILTIN_EXECUTABLES)
-#undef EXPOSE_BUILTIN_EXECUTABLES
-
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_IDENTIFIER_ACCESSOR)
-
- void exportNames();
-
-private:
- JSC::VM& m_vm;
-
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_NAMES)
-
-#define DECLARE_BUILTIN_SOURCE_MEMBERS(name, functionName, length) \
- JSC::SourceCode m_##name##Source;\
- JSC::Weak<JSC::UnlinkedFunctionExecutable> m_##name##Executable;
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(DECLARE_BUILTIN_SOURCE_MEMBERS)
-#undef DECLARE_BUILTIN_SOURCE_MEMBERS
-
-};
-
-#define DEFINE_BUILTIN_EXECUTABLES(name, functionName, length) \
-inline JSC::UnlinkedFunctionExecutable* xmlCasingTestBuiltinsWrapper::name##Executable() \
-{\
- if (!m_##name##Executable)\
- m_##name##Executable = JSC::Weak<JSC::UnlinkedFunctionExecutable>(JSC::createBuiltinExecutable(m_vm, m_##name##Source, functionName##PublicName(), s_##name##ConstructAbility), this, &m_##name##Executable);\
- return m_##name##Executable.get();\
-}
-WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(DEFINE_BUILTIN_EXECUTABLES)
-#undef DEFINE_BUILTIN_EXECUTABLES
-
-inline void xmlCasingTestBuiltinsWrapper::exportNames()
-{
-#define EXPORT_FUNCTION_NAME(name) m_vm.propertyNames->appendExternalName(name##PublicName(), name##PrivateName());
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(EXPORT_FUNCTION_NAME)
-#undef EXPORT_FUNCTION_NAME
-}
-
-class xmlCasingTestBuiltinFunctions {
-public:
- explicit xmlCasingTestBuiltinFunctions(JSC::VM& vm) : m_vm(vm) { }
-
- void init(JSC::JSGlobalObject&);
- void visit(JSC::SlotVisitor&);
-
-public:
- JSC::VM& m_vm;
-
-#define DECLARE_BUILTIN_SOURCE_MEMBERS(functionName) \
- JSC::WriteBarrier<JSC::JSFunction> m_##functionName##Function;
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_BUILTIN_SOURCE_MEMBERS)
-#undef DECLARE_BUILTIN_SOURCE_MEMBERS
-};
-
-inline void xmlCasingTestBuiltinFunctions::init(JSC::JSGlobalObject& globalObject)
-{
-#define EXPORT_FUNCTION(codeName, functionName, length)\
- m_##functionName##Function.set(m_vm, &globalObject, JSC::JSFunction::createBuiltinFunction(m_vm, codeName##Generator(m_vm), &globalObject));
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(EXPORT_FUNCTION)
-#undef EXPORT_FUNCTION
-}
-
-inline void xmlCasingTestBuiltinFunctions::visit(JSC::SlotVisitor& visitor)
-{
-#define VISIT_FUNCTION(name) visitor.append(&m_##name##Function);
- WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(VISIT_FUNCTION)
-#undef VISIT_FUNCTION
-}
-
-
-} // namespace WebCore
-
-#endif // ENABLE(STREAMS_API)
-
-#endif // xmlCasingTestBuiltinsWrapper_h
-
-### End File: xmlCasingTestBuiltinsWrapper.h
</del></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -3607,7 +3607,6 @@
</span><span class="cx"> ${JavaScriptCore_SCRIPTS_DIR}/builtins_generate_combined_implementation.py
</span><span class="cx"> ${JavaScriptCore_SCRIPTS_DIR}/builtins_generate_separate_header.py
</span><span class="cx"> ${JavaScriptCore_SCRIPTS_DIR}/builtins_generate_separate_implementation.py
</span><del>- ${JavaScriptCore_SCRIPTS_DIR}/builtins_generate_separate_wrapper.py
</del><span class="cx"> ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py
</span><span class="cx"> ${JavaScriptCore_SCRIPTS_DIR}/lazywriter.py
</span><span class="cx"> )
</span><span class="lines">@@ -3617,14 +3616,12 @@
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.cpp
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h
</span><del>- ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}BuiltinsWrapper.h
</del><span class="cx"> MAIN_DEPENDENCY ${_builtinSource}
</span><span class="cx"> DEPENDS ${BUILTINS_GENERATOR_SCRIPTS}
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_SCRIPTS_DIR}/generate-js-builtins.py --framework WebCore --output-directory ${DERIVED_SOURCES_WEBCORE_DIR} ${_builtinSource}
</span><span class="cx"> VERBATIM)
</span><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}Builtins.h
</span><del>- ${DERIVED_SOURCES_WEBCORE_DIR}/${_objectName}BuiltinsWrapper.h
</del><span class="cx"> )
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/bindings/js/WebCoreJSBuiltins.cpp ${_objectName}Builtins.cpp)
</span><span class="cx"> endforeach ()
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/ChangeLog 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-31 Brian Burg <bburg@apple.com>
+
+ Builtins generator should put WebCore-only wrappers in the per-builtin header
+ https://bugs.webkit.org/show_bug.cgi?id=150539
+
+ Reviewed by Youenn Fablet.
+
+ Fix includes of removed XXXWrapper.h headers.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/WebCoreJSBuiltinInternals.h:
+ * bindings/js/WebCoreJSBuiltins.h:
+
</ins><span class="cx"> 2015-10-31 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Add the support for Symbol attributes on IDL
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/DerivedSources.make 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -1277,7 +1277,6 @@
</span><span class="cx"> $(JavaScriptCore_SCRIPTS_DIR)/builtins_generate_combined_implementation.py \
</span><span class="cx"> $(JavaScriptCore_SCRIPTS_DIR)/builtins_generate_separate_header.py \
</span><span class="cx"> $(JavaScriptCore_SCRIPTS_DIR)/builtins_generate_separate_implementation.py \
</span><del>- $(JavaScriptCore_SCRIPTS_DIR)/builtins_generate_separate_wrapper.py \
</del><span class="cx"> $(JavaScriptCore_SCRIPTS_DIR)/generate-js-builtins.py \
</span><span class="cx"> $(JavaScriptCore_SCRIPTS_DIR)/lazywriter.py \
</span><span class="cx"> #
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -1515,9 +1515,6 @@
</span><span class="cx"> 416E6FE81BBD12DF000A6053 /* WritableStreamInternalsBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764E9 /* WritableStreamInternalsBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 416E6FE91BBD12E5000A6043 /* ReadableStreamBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764D8 /* ReadableStreamBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 416E6FE91BBD12E5000A6053 /* WritableStreamBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8061BB3110D00B764E8 /* WritableStreamBuiltins.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 416E6FEA1BBD1684000A6034 /* StreamInternalsBuiltinsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764CA /* StreamInternalsBuiltinsWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 416E6FEA1BBD1684000A6044 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 416E6FEA1BBD1684000A6054 /* WritableStreamInternalsBuiltinsWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B03D8071BB3110D00B764EA /* WritableStreamInternalsBuiltinsWrapper.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><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">@@ -11388,22 +11385,18 @@
</span><span class="cx"> 9908B0F11BCACF9100ED0F75 /* WritableStreamInternals.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = WritableStreamInternals.js; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0F21BCACF9100ED0F65 /* ReadableStreamReader.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = ReadableStreamReader.js; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0F31BCACFFE00ED0F65 /* ByteLengthQueuingStrategyBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ByteLengthQueuingStrategyBuiltins.cpp; sourceTree = "<group>"; };
</span><del>- 9908B0F41BCACFFE00ED0F65 /* ByteLengthQueuingStrategyBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteLengthQueuingStrategyBuiltinsWrapper.h; sourceTree = "<group>"; };
</del><span class="cx"> 9908B0F51BCAD07D00ED0F65 /* ByteLengthQueuingStrategyBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteLengthQueuingStrategyBuiltins.h; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0F61BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CountQueuingStrategyBuiltins.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0F71BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountQueuingStrategyBuiltins.h; sourceTree = "<group>"; };
</span><del>- 9908B0F81BCAD07D00ED0F65 /* CountQueuingStrategyBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CountQueuingStrategyBuiltinsWrapper.h; sourceTree = "<group>"; };
</del><span class="cx"> 9908B0F91BCAD07D00ED0F65 /* ReadableStreamBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamBuiltins.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0F91BCAD07D00ED0F75 /* WritableStreamBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WritableStreamBuiltins.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0FA1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamControllerBuiltins.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0FB1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamControllerBuiltins.h; sourceTree = "<group>"; };
</span><del>- 9908B0FC1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamControllerBuiltinsWrapper.h; sourceTree = "<group>"; };
</del><span class="cx"> 9908B0FD1BCAD07D00ED0F55 /* StreamInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StreamInternalsBuiltins.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0FD1BCAD07D00ED0F65 /* ReadableStreamInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamInternalsBuiltins.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0FD1BCAD07D00ED0F75 /* WritableStreamInternalsBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WritableStreamInternalsBuiltins.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0FE1BCAD07D00ED0F65 /* ReadableStreamReaderBuiltins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReadableStreamReaderBuiltins.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9908B0FF1BCAD07D00ED0F65 /* ReadableStreamReaderBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamReaderBuiltins.h; sourceTree = "<group>"; };
</span><del>- 9908B1001BCAD07D00ED0F65 /* ReadableStreamReaderBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamReaderBuiltinsWrapper.h; sourceTree = "<group>"; };
</del><span class="cx"> 9920398018B95BC600B39AF9 /* UserInputBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserInputBridge.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 9920398118B95BC600B39AF9 /* UserInputBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInputBridge.h; sourceTree = "<group>"; };
</span><span class="cx"> 9994E5D81BD843A300F2D835 /* MediaDevices.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = MediaDevices.js; sourceTree = "<group>"; };
</span><span class="lines">@@ -11446,11 +11439,6 @@
</span><span class="cx"> 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltins.h; sourceTree = "<group>"; };
</span><span class="cx"> 9B03D8061BB3110D00B764E8 /* WritableStreamBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamBuiltins.h; sourceTree = "<group>"; };
</span><span class="cx"> 9B03D8061BB3110D00B764E9 /* WritableStreamInternalsBuiltins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamInternalsBuiltins.h; sourceTree = "<group>"; };
</span><del>- 9B03D8071BB3110D00B764CA /* StreamInternalsBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamInternalsBuiltinsWrapper.h; sourceTree = "<group>"; };
- 9B03D8071BB3110D00B764D8 /* ReadableStreamBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamBuiltinsWrapper.h; sourceTree = "<group>"; };
- 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReadableStreamInternalsBuiltinsWrapper.h; sourceTree = "<group>"; };
- 9B03D8071BB3110D00B764E8 /* WritableStreamBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamBuiltinsWrapper.h; sourceTree = "<group>"; };
- 9B03D8071BB3110D00B764EA /* WritableStreamInternalsBuiltinsWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WritableStreamInternalsBuiltinsWrapper.h; sourceTree = "<group>"; };
</del><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">@@ -17196,12 +17184,10 @@
</span><span class="cx"> children = (
</span><span class="cx"> 9908B0F31BCACFFE00ED0F65 /* ByteLengthQueuingStrategyBuiltins.cpp */,
</span><span class="cx"> 9908B0F51BCAD07D00ED0F65 /* ByteLengthQueuingStrategyBuiltins.h */,
</span><del>- 9908B0F41BCACFFE00ED0F65 /* ByteLengthQueuingStrategyBuiltinsWrapper.h */,
</del><span class="cx"> 656581AC09D14EE6000E61D7 /* CharsetData.cpp */,
</span><span class="cx"> E406F3FB1198307D009D59D6 /* ColorData.cpp */,
</span><span class="cx"> 9908B0F61BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.cpp */,
</span><span class="cx"> 9908B0F71BCAD07D00ED0F65 /* CountQueuingStrategyBuiltins.h */,
</span><del>- 9908B0F81BCAD07D00ED0F65 /* CountQueuingStrategyBuiltinsWrapper.h */,
</del><span class="cx"> 6565814409D13043000E61D7 /* CSSGrammar.cpp */,
</span><span class="cx"> 650F53DB09D15DDA00C9B0C8 /* CSSGrammar.h */,
</span><span class="cx"> E41EA038119836DB00710BC5 /* CSSPropertyNames.cpp */,
</span><span class="lines">@@ -17254,16 +17240,12 @@
</span><span class="cx"> 71E2183917359FB8006E6E4D /* PlugInsResourcesData.cpp */,
</span><span class="cx"> 9908B0F91BCAD07D00ED0F65 /* ReadableStreamBuiltins.cpp */,
</span><span class="cx"> 9B03D8061BB3110D00B764D8 /* ReadableStreamBuiltins.h */,
</span><del>- 9B03D8071BB3110D00B764D8 /* ReadableStreamBuiltinsWrapper.h */,
</del><span class="cx"> 9908B0FA1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltins.cpp */,
</span><span class="cx"> 9908B0FB1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltins.h */,
</span><del>- 9908B0FC1BCAD07D00ED0F65 /* ReadableStreamControllerBuiltinsWrapper.h */,
</del><span class="cx"> 9908B0FD1BCAD07D00ED0F65 /* ReadableStreamInternalsBuiltins.cpp */,
</span><span class="cx"> 9B03D8061BB3110D00B764D9 /* ReadableStreamInternalsBuiltins.h */,
</span><del>- 9B03D8071BB3110D00B764DA /* ReadableStreamInternalsBuiltinsWrapper.h */,
</del><span class="cx"> 9908B0FE1BCAD07D00ED0F65 /* ReadableStreamReaderBuiltins.cpp */,
</span><span class="cx"> 9908B0FF1BCAD07D00ED0F65 /* ReadableStreamReaderBuiltins.h */,
</span><del>- 9908B1001BCAD07D00ED0F65 /* ReadableStreamReaderBuiltinsWrapper.h */,
</del><span class="cx"> 43B85ED218CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.cpp */,
</span><span class="cx"> 43B85ED318CBEC5200E31AF4 /* SelectorPseudoClassAndCompatibilityElementMap.gperf */,
</span><span class="cx"> 26AA0F9D18D2A18B00419381 /* SelectorPseudoElementTypeMap.cpp */,
</span><span class="lines">@@ -17271,7 +17253,6 @@
</span><span class="cx"> 53EF766A16530A61004CBE49 /* SettingsMacros.h */,
</span><span class="cx"> 9908B0FD1BCAD07D00ED0F55 /* StreamInternalsBuiltins.cpp */,
</span><span class="cx"> 9B03D8061BB3110D00B764C9 /* StreamInternalsBuiltins.h */,
</span><del>- 9B03D8071BB3110D00B764CA /* StreamInternalsBuiltinsWrapper.h */,
</del><span class="cx"> 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */,
</span><span class="cx"> 83C05A581A686212007E5DEA /* StylePropertyShorthandFunctions.cpp */,
</span><span class="cx"> 83C05A591A686212007E5DEA /* StylePropertyShorthandFunctions.h */,
</span><span class="lines">@@ -17290,10 +17271,8 @@
</span><span class="cx"> 99CC0B6918BEA1FF006CEBCC /* WebReplayInputs.h */,
</span><span class="cx"> 9908B0F91BCAD07D00ED0F75 /* WritableStreamBuiltins.cpp */,
</span><span class="cx"> 9B03D8061BB3110D00B764E8 /* WritableStreamBuiltins.h */,
</span><del>- 9B03D8071BB3110D00B764E8 /* WritableStreamBuiltinsWrapper.h */,
</del><span class="cx"> 9908B0FD1BCAD07D00ED0F75 /* WritableStreamInternalsBuiltins.cpp */,
</span><span class="cx"> 9B03D8061BB3110D00B764E9 /* WritableStreamInternalsBuiltins.h */,
</span><del>- 9B03D8071BB3110D00B764EA /* WritableStreamInternalsBuiltinsWrapper.h */,
</del><span class="cx"> 656581EA09D1508D000E61D7 /* XLinkNames.cpp */,
</span><span class="cx"> 656581EB09D1508D000E61D7 /* XLinkNames.h */,
</span><span class="cx"> A833C80A0A2CF25600D57664 /* XMLNames.cpp */,
</span><span class="lines">@@ -26913,7 +26892,6 @@
</span><span class="cx"> A84D827C11D333ED00972990 /* RawDataDocumentParser.h in Headers */,
</span><span class="cx"> 416E6FE91BBD12E5000A6043 /* ReadableStreamBuiltins.h in Headers */,
</span><span class="cx"> 416E6FE81BBD12DF000A6043 /* ReadableStreamInternalsBuiltins.h in Headers */,
</span><del>- 416E6FEA1BBD1684000A6044 /* ReadableStreamInternalsBuiltinsWrapper.h in Headers */,
</del><span class="cx"> FD31603C12B0267600C1A359 /* RealtimeAnalyser.h in Headers */,
</span><span class="cx"> 4A4F65711AA997F100E38CDD /* RealtimeMediaSource.h in Headers */,
</span><span class="cx"> 4A4F65721AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h in Headers */,
</span><span class="lines">@@ -27346,7 +27324,6 @@
</span><span class="cx"> C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */,
</span><span class="cx"> 1A37636C1A2E68BB009A7EE2 /* StorageNamespaceProvider.h in Headers */,
</span><span class="cx"> 416E6FE81BBD12DF000A6033 /* StreamInternalsBuiltins.h in Headers */,
</span><del>- 416E6FEA1BBD1684000A6034 /* StreamInternalsBuiltinsWrapper.h in Headers */,
</del><span class="cx"> 81AC6C36131C57D30009A7E0 /* StringCallback.h in Headers */,
</span><span class="cx"> B23540F30D00782E002382FA /* StringTruncator.h in Headers */,
</span><span class="cx"> 9B6C41531344949000085B62 /* StringWithDirection.h in Headers */,
</span><span class="lines">@@ -28028,7 +28005,6 @@
</span><span class="cx"> 93309E24099E64920056E581 /* WrapContentsInDummySpanCommand.h in Headers */,
</span><span class="cx"> 416E6FE91BBD12E5000A6053 /* WritableStreamBuiltins.h in Headers */,
</span><span class="cx"> 416E6FE81BBD12DF000A6053 /* WritableStreamInternalsBuiltins.h in Headers */,
</span><del>- 416E6FEA1BBD1684000A6054 /* WritableStreamInternalsBuiltinsWrapper.h in Headers */,
</del><span class="cx"> 9BAF3B2412C1A39800014BF1 /* WritingDirection.h in Headers */,
</span><span class="cx"> 14476AA815DC4BB100305DB2 /* WritingMode.h in Headers */,
</span><span class="cx"> 6565820209D1508D000E61D7 /* XLinkNames.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSBuiltinInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx"> #define WebCoreJSBuiltinInternals_h
</span><span class="cx">
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><del>-#include "ReadableStreamInternalsBuiltinsWrapper.h"
-#include "StreamInternalsBuiltinsWrapper.h"
-#include "WritableStreamInternalsBuiltinsWrapper.h"
</del><ins>+#include "ReadableStreamInternalsBuiltins.h"
+#include "StreamInternalsBuiltins.h"
+#include "WritableStreamInternalsBuiltins.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsWebCoreJSBuiltinsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h (191841 => 191842)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2015-10-31 15:37:03 UTC (rev 191841)
+++ trunk/Source/WebCore/bindings/js/WebCoreJSBuiltins.h 2015-10-31 16:52:39 UTC (rev 191842)
</span><span class="lines">@@ -28,19 +28,19 @@
</span><span class="cx"> #define WebCoreJSBuiltins_h
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><del>-#include "MediaDevicesBuiltinsWrapper.h"
</del><ins>+#include "MediaDevicesBuiltins.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(STREAMS_API)
</span><del>-#include "ByteLengthQueuingStrategyBuiltinsWrapper.h"
-#include "CountQueuingStrategyBuiltinsWrapper.h"
-#include "ReadableStreamBuiltinsWrapper.h"
-#include "ReadableStreamControllerBuiltinsWrapper.h"
-#include "ReadableStreamInternalsBuiltinsWrapper.h"
-#include "ReadableStreamReaderBuiltinsWrapper.h"
-#include "StreamInternalsBuiltinsWrapper.h"
-#include "WritableStreamBuiltinsWrapper.h"
-#include "WritableStreamInternalsBuiltinsWrapper.h"
</del><ins>+#include "ByteLengthQueuingStrategyBuiltins.h"
+#include "CountQueuingStrategyBuiltins.h"
+#include "ReadableStreamBuiltins.h"
+#include "ReadableStreamControllerBuiltins.h"
+#include "ReadableStreamInternalsBuiltins.h"
+#include "ReadableStreamReaderBuiltins.h"
+#include "StreamInternalsBuiltins.h"
+#include "WritableStreamBuiltins.h"
+#include "WritableStreamInternalsBuiltins.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #include <runtime/VM.h>
</span></span></pre>
</div>
</div>
</body>
</html>