<!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>[191984] tags/Safari-602.1.9.1/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/191984">191984</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-11-03 15:27:04 -0800 (Tue, 03 Nov 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/191982">r191982</a>.  rdar://problem/23376483</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari602191SourceJavaScriptCoreChangeLog">tags/Safari-602.1.9.1/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari602191SourceJavaScriptCoreparserParserh">tags/Safari-602.1.9.1/Source/JavaScriptCore/parser/Parser.h</a></li>
<li><a href="#tagsSafari602191SourceJavaScriptCoreruntimeVMh">tags/Safari-602.1.9.1/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#tagsSafari602191SourceWebCoreChangeLog">tags/Safari-602.1.9.1/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari602191SourceWebCorebindingsjsJSDOMWindowBasecpp">tags/Safari-602.1.9.1/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari602191SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/JavaScriptCore/ChangeLog (191983 => 191984)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/JavaScriptCore/ChangeLog        2015-11-03 23:24:50 UTC (rev 191983)
+++ tags/Safari-602.1.9.1/Source/JavaScriptCore/ChangeLog        2015-11-03 23:27:04 UTC (rev 191984)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-11-03  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
+        Merge r191982.
+
+    2015-11-03  Saam barati  &lt;sbarati@apple.com&gt;
+
+            Rewrite &quot;const&quot; as &quot;var&quot; for iTunes/iBooks on the Mac
+            https://bugs.webkit.org/show_bug.cgi?id=150852
+
+            Reviewed by Geoffrey Garen.
+
+            VM now has a setting indicating if we should treat
+            &quot;const&quot; variables as &quot;var&quot; to more closely match
+            JSC's previous implementation of &quot;const&quot; before ES6.
+
+            * parser/Parser.h:
+            (JSC::Parser::next):
+            (JSC::Parser::nextExpectIdentifier):
+            * runtime/VM.h:
+            (JSC::VM::setShouldRewriteConstAsVar):
+            (JSC::VM::shouldRewriteConstAsVar):
+
</ins><span class="cx"> 2015-10-27  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Remove Timeline MarkDOMContent and MarkLoad, data is already available
</span></span></pre></div>
<a id="tagsSafari602191SourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/JavaScriptCore/parser/Parser.h (191983 => 191984)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/JavaScriptCore/parser/Parser.h        2015-11-03 23:24:50 UTC (rev 191983)
+++ tags/Safari-602.1.9.1/Source/JavaScriptCore/parser/Parser.h        2015-11-03 23:27:04 UTC (rev 191984)
</span><span class="lines">@@ -871,6 +871,8 @@
</span><span class="cx">         m_lastTokenEndPosition = JSTextPosition(lastLine, lastTokenEnd, lastTokenLineStart);
</span><span class="cx">         m_lexer-&gt;setLastLineNumber(lastLine);
</span><span class="cx">         m_token.m_type = m_lexer-&gt;lex(&amp;m_token, lexerFlags, strictMode());
</span><ins>+        if (UNLIKELY(m_token.m_type == CONSTTOKEN &amp;&amp; m_vm-&gt;shouldRewriteConstAsVar()))
+            m_token.m_type = VAR;
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     ALWAYS_INLINE void nextExpectIdentifier(unsigned lexerFlags = 0)
</span></span></pre></div>
<a id="tagsSafari602191SourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/JavaScriptCore/runtime/VM.h (191983 => 191984)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/JavaScriptCore/runtime/VM.h        2015-11-03 23:24:50 UTC (rev 191983)
+++ tags/Safari-602.1.9.1/Source/JavaScriptCore/runtime/VM.h        2015-11-03 23:27:04 UTC (rev 191984)
</span><span class="lines">@@ -581,6 +581,8 @@
</span><span class="cx"> 
</span><span class="cx">     JS_EXPORT_PRIVATE void queueMicrotask(JSGlobalObject*, PassRefPtr&lt;Microtask&gt;);
</span><span class="cx">     JS_EXPORT_PRIVATE void drainMicrotasks();
</span><ins>+    JS_EXPORT_PRIVATE void setShouldRewriteConstAsVar(bool shouldRewrite) { m_shouldRewriteConstAsVar = shouldRewrite; }
+    ALWAYS_INLINE bool shouldRewriteConstAsVar() { return m_shouldRewriteConstAsVar; }
</ins><span class="cx"> 
</span><span class="cx">     inline bool shouldTriggerTermination(ExecState*);
</span><span class="cx"> 
</span><span class="lines">@@ -634,6 +636,7 @@
</span><span class="cx">     Exception* m_lastException { nullptr };
</span><span class="cx">     bool m_failNextNewCodeBlock { false };
</span><span class="cx">     bool m_inDefineOwnProperty;
</span><ins>+    bool m_shouldRewriteConstAsVar { false };
</ins><span class="cx">     std::unique_ptr&lt;CodeCache&gt; m_codeCache;
</span><span class="cx">     LegacyProfiler* m_enabledProfiler;
</span><span class="cx">     std::unique_ptr&lt;BuiltinExecutables&gt; m_builtinExecutables;
</span></span></pre></div>
<a id="tagsSafari602191SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/WebCore/ChangeLog (191983 => 191984)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebCore/ChangeLog        2015-11-03 23:24:50 UTC (rev 191983)
+++ tags/Safari-602.1.9.1/Source/WebCore/ChangeLog        2015-11-03 23:27:04 UTC (rev 191984)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-11-03  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
+        Merge r191982.
+
+    2015-11-03  Saam barati  &lt;sbarati@apple.com&gt;
+
+            Rewrite &quot;const&quot; as &quot;var&quot; for iTunes/iBooks on the Mac
+            https://bugs.webkit.org/show_bug.cgi?id=150852
+
+            Reviewed by Geoffrey Garen.
+
+            * bindings/js/JSDOMWindowBase.cpp:
+            (WebCore::JSDOMWindowBase::commonVM):
+
</ins><span class="cx"> 2015-10-29  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r191720.
</span></span></pre></div>
<a id="tagsSafari602191SourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (191983 => 191984)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebCore/bindings/js/JSDOMWindowBase.cpp        2015-11-03 23:24:50 UTC (rev 191983)
+++ tags/Safari-602.1.9.1/Source/WebCore/bindings/js/JSDOMWindowBase.cpp        2015-11-03 23:27:04 UTC (rev 191984)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include &quot;JSNode.h&quot;
</span><span class="cx"> #include &quot;Logging.h&quot;
</span><span class="cx"> #include &quot;Page.h&quot;
</span><ins>+#include &quot;RuntimeApplicationChecks.h&quot;
</ins><span class="cx"> #include &quot;ScriptController.h&quot;
</span><span class="cx"> #include &quot;SecurityOrigin.h&quot;
</span><span class="cx"> #include &quot;Settings.h&quot;
</span><span class="lines">@@ -256,6 +257,12 @@
</span><span class="cx">         vm-&gt;heap.setIncrementalSweeper(std::make_unique&lt;WebSafeIncrementalSweeper&gt;(&amp;vm-&gt;heap));
</span><span class="cx">         vm-&gt;heap.machineThreads().addCurrentThread();
</span><span class="cx"> #endif
</span><ins>+
+#if PLATFORM(MAC)
+        if (applicationIsITunes() || applicationIsIBooks())
+            vm-&gt;setShouldRewriteConstAsVar(true);
+#endif
+
</ins><span class="cx">         initNormalWorldClientData(vm);
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>