<!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>[203355] branches/safari-602-branch/Source/JavaScriptCore</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/203355">203355</a></dd>

<dt>Author</dt> <dd>bshafiei@apple.com</dd>

<dt>Date</dt> <dd>2016-07-18 11:51:13 -0700 (Mon, 18 Jul 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/203353">r203353</a>.  rdar://problem/27405849</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#branchessafari602branchSourceJavaScriptCoreChangeLog">branches/safari-602-branch/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#branchessafari602branchSourceJavaScriptCoreScriptsbuiltinsbuiltins_generate_internals_wrapper_implementationpy">branches/safari-602-branch/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py</a></li>

<li><a href="#branchessafari602branchSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreArbitraryConditionalGuardSeparatejsresult">branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result</a></li>

<li><a href="#branchessafari602branchSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedBuiltinSeparatejsresult">branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result</a></li>

<li><a href="#branchessafari602branchSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedInternalBuiltinSeparatejsresult">branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result</a></li>

<li><a href="#branchessafari602branchSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreUnguardedBuiltinSeparatejsresult">branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result</a></li>

<li><a href="#branchessafari602branchSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCorexmlCasingTestSeparatejsresult">branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="branchessafari602branchSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/ChangeLog (203354 => 203355)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/ChangeLog        2016-07-18 18:48:23 UTC (rev 203354)

+++ branches/safari-602-branch/Source/JavaScriptCore/ChangeLog        2016-07-18 18:51:13 UTC (rev 203355)

</span><span class="lines">@@ -1,3 +1,37 @@

</span><ins>+2016-07-18  Babak Shafiei  &lt;bshafiei@apple.com&gt;

+

+        Merge r203353.

+

+    2016-07-18  Youenn Fablet  &lt;youenn@apple.com&gt;

+

+            REGRESSION(r202975): --minimal build is broken

+            https://bugs.webkit.org/show_bug.cgi?id=159765

+

+            Reviewed by Chris Dumez.

+

+            Covered partially by builtin generated test code.

+

+            Updating generator to add a global compilation guard around the code that generates all global internal properties.

+            Split the generate_methods function in two, one dedicated to the visit method and the second one dedicated to

+            the initialize method.

+

+            * Scripts/builtins/builtins_generate_internals_wrapper_implementation.py:

+            (BuiltinsInternalsWrapperImplementationGenerator.generate_section_for_object): Use splitted generation functions.

+            (BuiltinsInternalsWrapperImplementationGenerator.generate_visit_method): Response to generate the visit method.

+            (BuiltinsInternalsWrapperImplementationGenerator._generate_initialize_static_globals): Responsible to generate

+            the code to initialize the internal globals. This code is put in a global compilation guard in case all

+            internals are compiled out by specific builds.

+            (BuiltinsInternalsWrapperImplementationGenerator):

+            (BuiltinsInternalsWrapperImplementationGenerator.generate_initialize_method): Responsible to generate the

+            initialize method.

+            (BuiltinsInternalsWrapperImplementationGenerator.generate_methods): Deleted.

+            * Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result: Copyright change.

+            * Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result: Ditto.

+            * Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result: Ditto.

+            * Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result: Ditto.

+            * Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result: Reflects partially the built-in

+            generator change.

+

</ins><span class="cx"> 2016-07-16  Filip Pizlo  &lt;fpizlo@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         DFG CSE is broken for MultiGetByOffset

</span></span></pre></div>

<a id="branchessafari602branchSourceJavaScriptCoreScriptsbuiltinsbuiltins_generate_internals_wrapper_implementationpy"></a>

<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py (203354 => 203355)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py        2016-07-18 18:48:23 UTC (rev 203354)

+++ branches/safari-602-branch/Source/JavaScriptCore/Scripts/builtins/builtins_generate_internals_wrapper_implementation.py        2016-07-18 18:51:13 UTC (rev 203355)

</span><span class="lines">@@ -83,7 +83,8 @@

</span><span class="cx">         lines = []

</span><span class="cx"> 

</span><span class="cx">         lines.append(self.generate_constructor())

</span><del>-        lines.append(self.generate_methods())

</del><ins>+        lines.append(self.generate_visit_method())

+        lines.append(self.generate_initialize_method())

</ins><span class="cx">         return '\n'.join(lines)

</span><span class="cx"> 

</span><span class="cx">     def accessor_name(self, object):

</span><span class="lines">@@ -113,26 +114,38 @@

</span><span class="cx">         lines.append(&quot;#undef DECLARE_GLOBAL_STATIC&quot;)

</span><span class="cx">         return '\n'.join(lines)

</span><span class="cx"> 

</span><del>-    def generate_methods(self):

</del><ins>+    def generate_visit_method(self):

</ins><span class="cx">         lines = [&quot;void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor&amp; visitor)&quot;,

</span><span class="cx">                  &quot;{&quot;]

</span><span class="cx">         for object in self.internals:

</span><span class="cx">             visit = &quot;    %s.visit(visitor);&quot; % self.member_name(object)

</span><span class="cx">             lines.append(BuiltinsGenerator.wrap_with_guard(object.annotations.get('conditional'), visit))

</span><del>-        lines.append(&quot;    UNUSED_PARAM(visitor);\n}&quot;)

</del><ins>+        lines.append(&quot;    UNUSED_PARAM(visitor);&quot;)

+        lines.append(&quot;}\n&quot;)

+        return '\n'.join(lines)

</ins><span class="cx"> 

</span><del>-        lines.append(&quot;void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject&amp; globalObject)&quot;)

-        lines.append(&quot;{&quot;)

</del><ins>+    def _generate_initialize_static_globals(self):

+        lines = [&quot;    JSVMClientData&amp; clientData = *static_cast&lt;JSVMClientData*&gt;(m_vm.clientData);&quot;,

+                 &quot;    JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {&quot;]

</ins><span class="cx">         for object in self.internals:

</span><del>-            init = &quot;    %s.init(globalObject);&quot; % self.member_name(object)

-            lines.append(BuiltinsGenerator.wrap_with_guard(object.annotations.get('conditional'), init))

-

-        lines.append(&quot;    JSVMClientData&amp; clientData = *static_cast&lt;JSVMClientData*&gt;(m_vm.clientData);&quot;)

-        lines.append(&quot;    JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {&quot;)

-        for object in self.internals:

</del><span class="cx">             lines.append(BuiltinsGenerator.wrap_with_guard(object.annotations.get('conditional'), self.property_macro(object)))

</span><span class="cx">         lines.append(&quot;    };&quot;)

</span><span class="cx">         lines.append(&quot;    globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));&quot;)

</span><span class="cx">         lines.append(&quot;    UNUSED_PARAM(clientData);&quot;)

</span><ins>+        return '\n'.join(lines)

+

+    def generate_initialize_method(self):

+        lines = [&quot;void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject&amp; globalObject)&quot;,

+                &quot;{&quot;,

+                &quot;    UNUSED_PARAM(globalObject);&quot;]

+

+        for object in self.internals:

+            init = &quot;    %s.init(globalObject);&quot; % self.member_name(object)

+            lines.append(BuiltinsGenerator.wrap_with_guard(object.annotations.get('conditional'), init))

+        lines.append(&quot;&quot;)

+

+        guards = set([object.annotations.get('conditional') for object in self.internals if 'conditional' in object.annotations])

+        lines.append(BuiltinsGenerator.wrap_with_guard(&quot; || &quot;.join(guards), self._generate_initialize_static_globals()))

+

</ins><span class="cx">         lines.append(&quot;}&quot;)

</span><span class="cx">         return '\n'.join(lines)

</span></span></pre></div>

<a id="branchessafari602branchSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreArbitraryConditionalGuardSeparatejsresult"></a>

<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result (203354 => 203355)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result        2016-07-18 18:48:23 UTC (rev 203354)

+++ branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result        2016-07-18 18:51:13 UTC (rev 203355)

</span><span class="lines">@@ -199,6 +199,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltins.h

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -260,6 +261,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltins.cpp

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -293,6 +295,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltinInternals.h

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -346,6 +349,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltinInternals.cpp

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -393,8 +397,11 @@

</span><span class="cx"> {

</span><span class="cx">     UNUSED_PARAM(visitor);

</span><span class="cx"> }

</span><ins>+

</ins><span class="cx"> void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject&amp; globalObject)

</span><span class="cx"> {

</span><ins>+    UNUSED_PARAM(globalObject);

+

</ins><span class="cx">     JSVMClientData&amp; clientData = *static_cast&lt;JSVMClientData*&gt;(m_vm.clientData);

</span><span class="cx">     JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {

</span><span class="cx">     };

</span></span></pre></div>

<a id="branchessafari602branchSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedBuiltinSeparatejsresult"></a>

<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result (203354 => 203355)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result        2016-07-18 18:48:23 UTC (rev 203354)

+++ branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result        2016-07-18 18:51:13 UTC (rev 203355)

</span><span class="lines">@@ -199,6 +199,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltins.h

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -260,6 +261,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltins.cpp

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -293,6 +295,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltinInternals.h

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -346,6 +349,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltinInternals.cpp

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -393,8 +397,11 @@

</span><span class="cx"> {

</span><span class="cx">     UNUSED_PARAM(visitor);

</span><span class="cx"> }

</span><ins>+

</ins><span class="cx"> void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject&amp; globalObject)

</span><span class="cx"> {

</span><ins>+    UNUSED_PARAM(globalObject);

+

</ins><span class="cx">     JSVMClientData&amp; clientData = *static_cast&lt;JSVMClientData*&gt;(m_vm.clientData);

</span><span class="cx">     JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {

</span><span class="cx">     };

</span></span></pre></div>

<a id="branchessafari602branchSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreGuardedInternalBuiltinSeparatejsresult"></a>

<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result (203354 => 203355)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result        2016-07-18 18:48:23 UTC (rev 203354)

+++ branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result        2016-07-18 18:51:13 UTC (rev 203355)

</span><span class="lines">@@ -231,6 +231,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltins.h

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -295,6 +296,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltins.cpp

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -328,6 +330,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltinInternals.h

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -388,6 +391,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltinInternals.cpp

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -441,11 +445,15 @@

</span><span class="cx"> #endif // ENABLE(STREAMS_API)

</span><span class="cx">     UNUSED_PARAM(visitor);

</span><span class="cx"> }

</span><ins>+

</ins><span class="cx"> void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject&amp; globalObject)

</span><span class="cx"> {

</span><ins>+    UNUSED_PARAM(globalObject);

</ins><span class="cx"> #if ENABLE(STREAMS_API)

</span><span class="cx">     m_guardedInternalBuiltin.init(globalObject);

</span><span class="cx"> #endif // ENABLE(STREAMS_API)

</span><ins>+

+#if ENABLE(STREAMS_API)

</ins><span class="cx">     JSVMClientData&amp; clientData = *static_cast&lt;JSVMClientData*&gt;(m_vm.clientData);

</span><span class="cx">     JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {

</span><span class="cx"> #if ENABLE(STREAMS_API)

</span><span class="lines">@@ -458,6 +466,7 @@

</span><span class="cx">     };

</span><span class="cx">     globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));

</span><span class="cx">     UNUSED_PARAM(clientData);

</span><ins>+#endif // ENABLE(STREAMS_API)

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> } // namespace WebCore

</span></span></pre></div>

<a id="branchessafari602branchSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCoreUnguardedBuiltinSeparatejsresult"></a>

<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result (203354 => 203355)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result        2016-07-18 18:48:23 UTC (rev 203354)

+++ branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-UnguardedBuiltin-Separate.js-result        2016-07-18 18:51:13 UTC (rev 203355)

</span><span class="lines">@@ -190,6 +190,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltins.h

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -245,6 +246,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltins.cpp

</span><span class="cx"> /*

<span class="cx">  * Copyright (c) 2015 Canon Inc. All rights reserved.

<ins>+ * Copyright (c) 2016 Apple Inc. All rights reserved.

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -278,6 +280,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltinInternals.h

</span><span class="cx"> /*

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -331,6 +334,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltinInternals.cpp

</span><span class="cx"> /*

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -378,8 +382,11 @@

</span><span class="cx"> {

</span><span class="cx">     UNUSED_PARAM(visitor);

</span><span class="cx"> }

</span><ins>+

</ins><span class="cx"> void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject&amp; globalObject)

</span><span class="cx"> {

</span><ins>+    UNUSED_PARAM(globalObject);

+

</ins><span class="cx">     JSVMClientData&amp; clientData = *static_cast&lt;JSVMClientData*&gt;(m_vm.clientData);

</span><span class="cx">     JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {

</span><span class="cx">     };

</span></span></pre></div>

<a id="branchessafari602branchSourceJavaScriptCoreScriptstestsbuiltinsexpectedWebCorexmlCasingTestSeparatejsresult"></a>

<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result (203354 => 203355)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result        2016-07-18 18:48:23 UTC (rev 203354)

+++ branches/safari-602-branch/Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result        2016-07-18 18:51:13 UTC (rev 203355)

</span><span class="lines">@@ -282,6 +282,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltins.h

</span><span class="cx"> /*

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -346,6 +347,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltins.cpp

</span><span class="cx"> /*

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -379,6 +381,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltinInternals.h

</span><span class="cx"> /*

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -439,6 +442,7 @@

</span><span class="cx"> ### Begin File: WebCoreJSBuiltinInternals.cpp

</span><span class="cx"> /*

</ins><span class="cx">  * 

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span><span class="cx">  * modification, are permitted provided that the following conditions

</span><span class="lines">@@ -492,11 +496,15 @@

</span><span class="cx"> #endif // ENABLE(STREAMS_API)

</span><span class="cx">     UNUSED_PARAM(visitor);

</span><span class="cx"> }

</span><ins>+

</ins><span class="cx"> void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject&amp; globalObject)

</span><span class="cx"> {

</span><ins>+    UNUSED_PARAM(globalObject);

</ins><span class="cx"> #if ENABLE(STREAMS_API)

</span><span class="cx">     m_xmlCasingTest.init(globalObject);

</span><span class="cx"> #endif // ENABLE(STREAMS_API)

</span><ins>+

+#if ENABLE(STREAMS_API)

</ins><span class="cx">     JSVMClientData&amp; clientData = *static_cast&lt;JSVMClientData*&gt;(m_vm.clientData);

</span><span class="cx">     JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {

</span><span class="cx"> #if ENABLE(STREAMS_API)

</span><span class="lines">@@ -509,6 +517,7 @@

</span><span class="cx">     };

</span><span class="cx">     globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));

</span><span class="cx">     UNUSED_PARAM(clientData);

</span><ins>+#endif // ENABLE(STREAMS_API)

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> } // namespace WebCore

</span></span></pre>

</div>

</div>

</body>

</html>