Diff
Modified: tags/Safari-602.1.9.1/Source/WebCore/ChangeLog (192000 => 192001)
--- 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)
@@ -1,5 +1,23 @@
2015-11-03 Babak Shafiei <bshaf...@apple.com>
+ Merge r191999.
+
+ 2015-11-03 Geoffrey Garen <gga...@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 <bshaf...@apple.com>
+
Merge r191982.
2015-11-03 Saam barati <sbar...@apple.com>
Modified: tags/Safari-602.1.9.1/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (192000 => 192001)
--- 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)
@@ -259,7 +259,7 @@
#endif
#if PLATFORM(MAC)
- if (applicationIsITunes() || applicationIsIBooks())
+ if (applicationIsITunes() || applicationIsIBooks() || Settings::shouldRewriteConstAsVar())
vm->setShouldRewriteConstAsVar(true);
#endif
Modified: tags/Safari-602.1.9.1/Source/WebCore/page/Settings.cpp (192000 => 192001)
--- 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)
@@ -84,6 +84,7 @@
bool Settings::gShouldUseHighResolutionTimers = true;
#endif
+bool Settings::gShouldRewriteConstAsVar = false;
bool Settings::gShouldRespectPriorityInCSSAttributeSetters = false;
bool Settings::gLowPowerVideoAudioBufferSizeEnabled = false;
Modified: tags/Safari-602.1.9.1/Source/WebCore/page/Settings.h (192000 => 192001)
--- 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)
@@ -194,6 +194,9 @@
static bool shouldUseHighResolutionTimers() { return gShouldUseHighResolutionTimers; }
#endif
+ static bool shouldRewriteConstAsVar() { return gShouldRewriteConstAsVar; }
+ static void setShouldRewriteConstAsVar(bool shouldRewriteConstAsVar) { gShouldRewriteConstAsVar = shouldRewriteConstAsVar; }
+
WEBCORE_EXPORT void setBackgroundShouldExtendBeyondPage(bool);
bool backgroundShouldExtendBeyondPage() const { return m_backgroundShouldExtendBeyondPage; }
@@ -347,6 +350,7 @@
#if PLATFORM(WIN)
static bool gShouldUseHighResolutionTimers;
#endif
+ WEBCORE_EXPORT static bool gShouldRewriteConstAsVar;
static bool gShouldRespectPriorityInCSSAttributeSetters;
#if PLATFORM(IOS)
static bool gNetworkDataUsageTrackingEnabled;
Modified: tags/Safari-602.1.9.1/Source/WebKit2/ChangeLog (192000 => 192001)
--- 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)
@@ -1,3 +1,22 @@
+2015-11-03 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r191999.
+
+ 2015-11-03 Geoffrey Garen <gga...@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):
+
2015-10-28 Babak Shafiei <bshaf...@apple.com>
Merge r191673.
Modified: tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (192000 => 192001)
--- 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)
@@ -107,6 +107,7 @@
encoder << shouldUseFontSmoothing;
encoder << fontWhitelist;
encoder << iconDatabaseEnabled;
+ encoder << shouldRewriteConstAsVar;
encoder << terminationTimeout;
encoder << languages;
encoder << textCheckerState;
@@ -239,6 +240,8 @@
return false;
if (!decoder.decode(parameters.iconDatabaseEnabled))
return false;
+ if (!decoder.decode(parameters.shouldRewriteConstAsVar))
+ return false;
if (!decoder.decode(parameters.terminationTimeout))
return false;
if (!decoder.decode(parameters.languages))
Modified: tags/Safari-602.1.9.1/Source/WebKit2/Shared/WebProcessCreationParameters.h (192000 => 192001)
--- 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)
@@ -117,6 +117,7 @@
Vector<String> fontWhitelist;
bool iconDatabaseEnabled;
+ bool shouldRewriteConstAsVar { false };
double terminationTimeout;
Modified: tags/Safari-602.1.9.1/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (192000 => 192001)
--- 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)
@@ -44,6 +44,7 @@
#import <WebCore/NotImplemented.h>
#import <WebCore/PlatformPasteboard.h>
#import <WebCore/SharedBuffer.h>
+#import <WebCore/RuntimeApplicationChecks.h>
#import <sys/param.h>
#if ENABLE(NETWORK_PROCESS)
@@ -174,6 +175,10 @@
parameters.shouldEnableFTLJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLJITEnabledDefaultsKey];
parameters.shouldEnableMemoryPressureReliefLogging = [[NSUserDefaults standardUserDefaults] boolForKey:@"LogMemoryJetsamDetails"];
+#if PLATFORM(MAC)
+ parameters.shouldRewriteConstAsVar = applicationIsIBooks();
+#endif
+
#if HAVE(HOSTED_CORE_ANIMATION)
#if !PLATFORM(IOS)
parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
Modified: tags/Safari-602.1.9.1/Source/WebKit2/WebProcess/WebProcess.cpp (192000 => 192001)
--- 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)
@@ -336,6 +336,8 @@
for (auto& scheme : parameters.urlSchemesRegisteredAsCORSEnabled)
registerURLSchemeAsCORSEnabled(scheme);
+ WebCore::Settings::setShouldRewriteConstAsVar(parameters.shouldRewriteConstAsVar);
+
#if ENABLE(CACHE_PARTITIONING)
for (auto& scheme : parameters.urlSchemesRegisteredAsCachePartitioned)
registerURLSchemeAsCachePartitioned(scheme);
