<!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>[192001] 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/192001">192001</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-11-03 17:01:34 -0800 (Tue, 03 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/191999">r191999</a>. rdar://problem/23376483</pre>
<h3>Modified Paths</h3>
<ul>
<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>
<li><a href="#tagsSafari602191SourceWebCorepageSettingscpp">tags/Safari-602.1.9.1/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#tagsSafari602191SourceWebCorepageSettingsh">tags/Safari-602.1.9.1/Source/WebCore/page/Settings.h</a></li>
<li><a href="#tagsSafari602191SourceWebKit2ChangeLog">tags/Safari-602.1.9.1/Source/WebKit2/ChangeLog</a></li>
<li><a href="#tagsSafari602191SourceWebKit2SharedWebProcessCreationParameterscpp">tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#tagsSafari602191SourceWebKit2SharedWebProcessCreationParametersh">tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#tagsSafari602191SourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">tags/Safari-602.1.9.1/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#tagsSafari602191SourceWebKit2WebProcessWebProcesscpp">tags/Safari-602.1.9.1/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari602191SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/WebCore/ChangeLog (192000 => 192001)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebCore/ChangeLog 2015-11-04 01:00:39 UTC (rev 192000)
+++ tags/Safari-602.1.9.1/Source/WebCore/ChangeLog 2015-11-04 01:01:34 UTC (rev 192001)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-11-03 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191999.
+
+ 2015-11-03 Geoffrey Garen <ggaren@apple.com>
+
+ Provide a way to turn off const in WebKit2.
+
+ Reviewed by Sam Weinig.
+
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::commonVM):
+ * page/Settings.h:
+ (WebCore::Settings::shouldUseHighResolutionTimers):
+ (WebCore::Settings::shouldRewriteConstAsVar):
+ (WebCore::Settings::setShouldRewriteConstAsVar):
+ (WebCore::Settings::backgroundShouldExtendBeyondPage):
+
+2015-11-03 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r191982.
</span><span class="cx">
</span><span class="cx"> 2015-11-03 Saam barati <sbarati@apple.com>
</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 (192000 => 192001)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-11-04 01:00:39 UTC (rev 192000)
+++ tags/Safari-602.1.9.1/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2015-11-04 01:01:34 UTC (rev 192001)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- if (applicationIsITunes() || applicationIsIBooks())
</del><ins>+ if (applicationIsITunes() || applicationIsIBooks() || Settings::shouldRewriteConstAsVar())
</ins><span class="cx"> vm->setShouldRewriteConstAsVar(true);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari602191SourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/WebCore/page/Settings.cpp (192000 => 192001)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebCore/page/Settings.cpp 2015-11-04 01:00:39 UTC (rev 192000)
+++ tags/Safari-602.1.9.1/Source/WebCore/page/Settings.cpp 2015-11-04 01:01:34 UTC (rev 192001)
</span><span class="lines">@@ -84,6 +84,7 @@
</span><span class="cx"> bool Settings::gShouldUseHighResolutionTimers = true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+bool Settings::gShouldRewriteConstAsVar = false;
</ins><span class="cx"> bool Settings::gShouldRespectPriorityInCSSAttributeSetters = false;
</span><span class="cx"> bool Settings::gLowPowerVideoAudioBufferSizeEnabled = false;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari602191SourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/WebCore/page/Settings.h (192000 => 192001)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebCore/page/Settings.h 2015-11-04 01:00:39 UTC (rev 192000)
+++ tags/Safari-602.1.9.1/Source/WebCore/page/Settings.h 2015-11-04 01:01:34 UTC (rev 192001)
</span><span class="lines">@@ -194,6 +194,9 @@
</span><span class="cx"> static bool shouldUseHighResolutionTimers() { return gShouldUseHighResolutionTimers; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ static bool shouldRewriteConstAsVar() { return gShouldRewriteConstAsVar; }
+ static void setShouldRewriteConstAsVar(bool shouldRewriteConstAsVar) { gShouldRewriteConstAsVar = shouldRewriteConstAsVar; }
+
</ins><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">@@ -347,6 +350,7 @@
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> static bool gShouldUseHighResolutionTimers;
</span><span class="cx"> #endif
</span><ins>+ WEBCORE_EXPORT static bool gShouldRewriteConstAsVar;
</ins><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="tagsSafari602191SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/WebKit2/ChangeLog (192000 => 192001)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebKit2/ChangeLog 2015-11-04 01:00:39 UTC (rev 192000)
+++ tags/Safari-602.1.9.1/Source/WebKit2/ChangeLog 2015-11-04 01:01:34 UTC (rev 192001)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-11-03 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r191999.
+
+ 2015-11-03 Geoffrey Garen <ggaren@apple.com>
+
+ Provide a way to turn off const in WebKit2.
+
+ Reviewed by Sam Weinig.
+
+ * 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"> 2015-10-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r191673.
</span></span></pre></div>
<a id="tagsSafari602191SourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (192000 => 192001)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-11-04 01:00:39 UTC (rev 192000)
+++ tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-11-04 01:01:34 UTC (rev 192001)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> encoder << shouldUseFontSmoothing;
</span><span class="cx"> encoder << fontWhitelist;
</span><span class="cx"> encoder << iconDatabaseEnabled;
</span><ins>+ encoder << shouldRewriteConstAsVar;
</ins><span class="cx"> encoder << terminationTimeout;
</span><span class="cx"> encoder << languages;
</span><span class="cx"> encoder << textCheckerState;
</span><span class="lines">@@ -239,6 +240,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.iconDatabaseEnabled))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.shouldRewriteConstAsVar))
+ return false;
</ins><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="tagsSafari602191SourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.h (192000 => 192001)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-11-04 01:00:39 UTC (rev 192000)
+++ tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-11-04 01:01:34 UTC (rev 192001)
</span><span class="lines">@@ -117,6 +117,7 @@
</span><span class="cx"> Vector<String> fontWhitelist;
</span><span class="cx">
</span><span class="cx"> bool iconDatabaseEnabled;
</span><ins>+ bool shouldRewriteConstAsVar { false };
</ins><span class="cx">
</span><span class="cx"> double terminationTimeout;
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari602191SourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (192000 => 192001)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-11-04 01:00:39 UTC (rev 192000)
+++ tags/Safari-602.1.9.1/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-11-04 01:01:34 UTC (rev 192001)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #import <WebCore/NotImplemented.h>
</span><span class="cx"> #import <WebCore/PlatformPasteboard.h>
</span><span class="cx"> #import <WebCore/SharedBuffer.h>
</span><ins>+#import <WebCore/RuntimeApplicationChecks.h>
</ins><span class="cx"> #import <sys/param.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="lines">@@ -174,6 +175,10 @@
</span><span class="cx"> parameters.shouldEnableFTLJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLJITEnabledDefaultsKey];
</span><span class="cx"> parameters.shouldEnableMemoryPressureReliefLogging = [[NSUserDefaults standardUserDefaults] boolForKey:@"LogMemoryJetsamDetails"];
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+ parameters.shouldRewriteConstAsVar = applicationIsIBooks();
+#endif
+
</ins><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="tagsSafari602191SourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.9.1/Source/WebKit2/WebProcess/WebProcess.cpp (192000 => 192001)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.9.1/Source/WebKit2/WebProcess/WebProcess.cpp 2015-11-04 01:00:39 UTC (rev 192000)
+++ tags/Safari-602.1.9.1/Source/WebKit2/WebProcess/WebProcess.cpp 2015-11-04 01:01:34 UTC (rev 192001)
</span><span class="lines">@@ -336,6 +336,8 @@
</span><span class="cx"> for (auto& scheme : parameters.urlSchemesRegisteredAsCORSEnabled)
</span><span class="cx"> registerURLSchemeAsCORSEnabled(scheme);
</span><span class="cx">
</span><ins>+ WebCore::Settings::setShouldRewriteConstAsVar(parameters.shouldRewriteConstAsVar);
+
</ins><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>