<!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>[198932] 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/198932">198932</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-31 17:24:18 -0700 (Thu, 31 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert rewrite const as var workaround
https://bugs.webkit.org/show_bug.cgi?id=155393
Reviewed by Mark Lam.
Source/JavaScriptCore:
* parser/Parser.h:
(JSC::Parser::next):
(JSC::Parser::nextExpectIdentifier):
* runtime/VM.h:
(JSC::VM::setShouldRewriteConstAsVar): Deleted.
(JSC::VM::shouldRewriteConstAsVar): Deleted.
Source/WebCore:
* bindings/js/JSDOMWindowBase.cpp:
(WebCore::JSDOMWindowBase::commonVM):
* page/Settings.cpp:
* page/Settings.h:
(WebCore::Settings::shouldUseHighResolutionTimers):
(WebCore::Settings::backgroundShouldExtendBeyondPage):
(WebCore::Settings::shouldRewriteConstAsVar): Deleted.
(WebCore::Settings::setShouldRewriteConstAsVar): Deleted.
Source/WebKit2:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParserh">trunk/Source/JavaScriptCore/parser/Parser.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowBasecpp">trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-03-31 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><ins>+ Revert rewrite const as var workaround
+ https://bugs.webkit.org/show_bug.cgi?id=155393
+
+ Reviewed by Mark Lam.
+
+ * parser/Parser.h:
+ (JSC::Parser::next):
+ (JSC::Parser::nextExpectIdentifier):
+ * runtime/VM.h:
+ (JSC::VM::setShouldRewriteConstAsVar): Deleted.
+ (JSC::VM::shouldRewriteConstAsVar): Deleted.
+
+2016-03-31 Saam barati <sbarati@apple.com>
+
</ins><span class="cx"> [ES6] Disallow var assignments in for-in loops
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155451
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.h (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.h 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/JavaScriptCore/parser/Parser.h 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -1143,8 +1143,6 @@
</span><span class="cx"> m_lastTokenEndPosition = JSTextPosition(lastLine, lastTokenEnd, lastTokenLineStart);
</span><span class="cx"> m_lexer->setLastLineNumber(lastLine);
</span><span class="cx"> m_token.m_type = m_lexer->lex(&m_token, lexerFlags, strictMode());
</span><del>- if (UNLIKELY(m_token.m_type == CONSTTOKEN && m_vm->shouldRewriteConstAsVar()))
- m_token.m_type = VAR;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE void nextExpectIdentifier(unsigned lexerFlags = 0)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -598,8 +598,6 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void queueMicrotask(JSGlobalObject*, PassRefPtr<Microtask>);
</span><span class="cx"> JS_EXPORT_PRIVATE void drainMicrotasks();
</span><del>- JS_EXPORT_PRIVATE void setShouldRewriteConstAsVar(bool shouldRewrite) { m_shouldRewriteConstAsVar = shouldRewrite; }
- ALWAYS_INLINE bool shouldRewriteConstAsVar() { return m_shouldRewriteConstAsVar; }
</del><span class="cx">
</span><span class="cx"> inline bool shouldTriggerTermination(ExecState*);
</span><span class="cx">
</span><span class="lines">@@ -658,7 +656,6 @@
</span><span class="cx"> Exception* m_lastException { nullptr };
</span><span class="cx"> bool m_failNextNewCodeBlock { false };
</span><span class="cx"> bool m_inDefineOwnProperty;
</span><del>- bool m_shouldRewriteConstAsVar { false };
</del><span class="cx"> bool m_shouldBuildPCToCodeOriginMapping { false };
</span><span class="cx"> std::unique_ptr<CodeCache> m_codeCache;
</span><span class="cx"> LegacyProfiler* m_enabledProfiler;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebCore/ChangeLog 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-31 Saam barati <sbarati@apple.com>
+
+ Revert rewrite const as var workaround
+ https://bugs.webkit.org/show_bug.cgi?id=155393
+
+ Reviewed by Mark Lam.
+
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::commonVM):
+ * page/Settings.cpp:
+ * page/Settings.h:
+ (WebCore::Settings::shouldUseHighResolutionTimers):
+ (WebCore::Settings::backgroundShouldExtendBeyondPage):
+ (WebCore::Settings::shouldRewriteConstAsVar): Deleted.
+ (WebCore::Settings::setShouldRewriteConstAsVar): Deleted.
+
</ins><span class="cx"> 2016-03-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r196854.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -264,11 +264,6 @@
</span><span class="cx"> vm->heap.machineThreads().addCurrentThread();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- if (MacApplication::isITunes() || MacApplication::isIBooks() || Settings::shouldRewriteConstAsVar())
- vm->setShouldRewriteConstAsVar(true);
-#endif
-
</del><span class="cx"> initNormalWorldClientData(vm);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -97,7 +97,6 @@
</span><span class="cx"> bool Settings::gShouldUseHighResolutionTimers = true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool Settings::gShouldRewriteConstAsVar = false;
</del><span class="cx"> bool Settings::gShouldRespectPriorityInCSSAttributeSetters = false;
</span><span class="cx"> bool Settings::gLowPowerVideoAudioBufferSizeEnabled = false;
</span><span class="cx"> bool Settings::gResourceLoadStatisticsEnabledEnabled = false;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebCore/page/Settings.h 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -183,9 +183,6 @@
</span><span class="cx"> static bool shouldUseHighResolutionTimers() { return gShouldUseHighResolutionTimers; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- static bool shouldRewriteConstAsVar() { return gShouldRewriteConstAsVar; }
- static void setShouldRewriteConstAsVar(bool shouldRewriteConstAsVar) { gShouldRewriteConstAsVar = shouldRewriteConstAsVar; }
-
</del><span class="cx"> WEBCORE_EXPORT void setBackgroundShouldExtendBeyondPage(bool);
</span><span class="cx"> bool backgroundShouldExtendBeyondPage() const { return m_backgroundShouldExtendBeyondPage; }
</span><span class="cx">
</span><span class="lines">@@ -366,7 +363,6 @@
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> static bool gShouldUseHighResolutionTimers;
</span><span class="cx"> #endif
</span><del>- WEBCORE_EXPORT static bool gShouldRewriteConstAsVar;
</del><span class="cx"> static bool gShouldRespectPriorityInCSSAttributeSetters;
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static bool gNetworkDataUsageTrackingEnabled;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-31 Saam barati <sbarati@apple.com>
+
+ Revert rewrite const as var workaround
+ https://bugs.webkit.org/show_bug.cgi?id=155393
+
+ Reviewed by Mark Lam.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
</ins><span class="cx"> 2016-03-31 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Both WebPage's volatility timer and WebProcess's processSuspensionCleanupTimer are trying to make surfaces volatile with very short interval
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -99,7 +99,6 @@
</span><span class="cx"> encoder << resourceLoadStatisticsEnabled;
</span><span class="cx"> encoder << fontWhitelist;
</span><span class="cx"> encoder << iconDatabaseEnabled;
</span><del>- encoder << shouldRewriteConstAsVar;
</del><span class="cx"> encoder << terminationTimeout;
</span><span class="cx"> encoder << languages;
</span><span class="cx"> encoder << textCheckerState;
</span><span class="lines">@@ -220,8 +219,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.iconDatabaseEnabled))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.shouldRewriteConstAsVar))
- return false;
</del><span class="cx"> if (!decoder.decode(parameters.terminationTimeout))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.languages))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -112,7 +112,6 @@
</span><span class="cx"> Vector<String> fontWhitelist;
</span><span class="cx">
</span><span class="cx"> bool iconDatabaseEnabled;
</span><del>- bool shouldRewriteConstAsVar { false };
</del><span class="cx">
</span><span class="cx"> double terminationTimeout;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -172,10 +172,6 @@
</span><span class="cx"> parameters.shouldEnableMemoryPressureReliefLogging = [defaults boolForKey:@"LogMemoryJetsamDetails"];
</span><span class="cx"> parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
- parameters.shouldRewriteConstAsVar = MacApplication::isIBooks();
-#endif
-
</del><span class="cx"> #if HAVE(HOSTED_CORE_ANIMATION)
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (198931 => 198932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-04-01 00:24:18 UTC (rev 198932)
</span><span class="lines">@@ -329,8 +329,6 @@
</span><span class="cx"> for (auto& scheme : parameters.urlSchemesRegisteredAsAlwaysRevalidated)
</span><span class="cx"> registerURLSchemeAsAlwaysRevalidated(scheme);
</span><span class="cx">
</span><del>- WebCore::Settings::setShouldRewriteConstAsVar(parameters.shouldRewriteConstAsVar);
-
</del><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> for (auto& scheme : parameters.urlSchemesRegisteredAsCachePartitioned)
</span><span class="cx"> registerURLSchemeAsCachePartitioned(scheme);
</span></span></pre>
</div>
</div>
</body>
</html>