Title: [163930] trunk/Source/WebKit2
- Revision
- 163930
- Author
- [email protected]
- Date
- 2014-02-11 19:23:55 -0800 (Tue, 11 Feb 2014)
Log Message
[WebKit2, JSC] Add user default to disable the JIT
https://bugs.webkit.org/show_bug.cgi?id=128643
Reviewed by Filip Pizlo.
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/mac/WebContextMac.mm:
(WebKit::registerUserDefaultsIfNeeded):
(WebKit::WebContext::platformInitializeWebProcess):
* WebProcess/mac/WebProcessMac.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163929 => 163930)
--- trunk/Source/WebKit2/ChangeLog 2014-02-12 03:16:27 UTC (rev 163929)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-12 03:23:55 UTC (rev 163930)
@@ -1,3 +1,21 @@
+2014-02-11 Sam Weinig <[email protected]>
+
+ [WebKit2, JSC] Add user default to disable the JIT
+ https://bugs.webkit.org/show_bug.cgi?id=128643
+
+ Reviewed by Filip Pizlo.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::registerUserDefaultsIfNeeded):
+ (WebKit::WebContext::platformInitializeWebProcess):
+ * WebProcess/mac/WebProcessMac.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
2014-02-11 Ryosuke Niwa <[email protected]>
Frame::rectForSelection shouldn't instantiate FrameSelection
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (163929 => 163930)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-02-12 03:16:27 UTC (rev 163929)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-02-12 03:23:55 UTC (rev 163930)
@@ -40,6 +40,7 @@
, nsURLCacheDiskCapacity(0)
, shouldForceScreenFontSubstitution(false)
, shouldEnableKerningAndLigaturesByDefault(false)
+ , shouldEnableJIT(false)
, shouldEnableFTL(false)
#endif
#if ENABLE(NETWORK_PROCESS)
@@ -109,6 +110,7 @@
encoder << uiProcessBundleResourcePathExtensionHandle;
encoder << shouldForceScreenFontSubstitution;
encoder << shouldEnableKerningAndLigaturesByDefault;
+ encoder << shouldEnableJIT;
encoder << shouldEnableFTL;
#endif
@@ -233,6 +235,8 @@
return false;
if (!decoder.decode(parameters.shouldEnableKerningAndLigaturesByDefault))
return false;
+ if (!decoder.decode(parameters.shouldEnableJIT))
+ return false;
if (!decoder.decode(parameters.shouldEnableFTL))
return false;
#endif
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (163929 => 163930)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-02-12 03:16:27 UTC (rev 163929)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-02-12 03:23:55 UTC (rev 163930)
@@ -131,6 +131,7 @@
bool shouldForceScreenFontSubstitution;
bool shouldEnableKerningAndLigaturesByDefault;
+ bool shouldEnableJIT;
bool shouldEnableFTL;
#endif // PLATFORM(COCOA)
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (163929 => 163930)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-02-12 03:16:27 UTC (rev 163929)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-02-12 03:23:55 UTC (rev 163930)
@@ -67,7 +67,8 @@
NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
NSString *WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey = @"WebKitKerningAndLigaturesEnabledByDefault";
-NSString *WebKitFTLEnabledDefaultsKey = @"WebKitFTLEnabledDefaultsKey";
+NSString *WebKitJSCFTLEnabledDefaultsKey = @"WebKitJSCFTLEnabledDefaultsKey";
+NSString *WebKitJSCJITEnabledDefaultsKey = @"WebKitJSCJITEnabledDefaultsKey";
#if !PLATFORM(IOS)
static NSString *WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification = @"NSApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification";
@@ -97,7 +98,8 @@
#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
[registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
- [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitFTLEnabledDefaultsKey];
+ [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitJSCJITEnabledDefaultsKey];
+ [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitJSCFTLEnabledDefaultsKey];
#endif
[[NSUserDefaults standardUserDefaults] registerDefaults:registrationDictionary];
@@ -155,7 +157,8 @@
parameters.shouldForceScreenFontSubstitution = [[NSUserDefaults standardUserDefaults] boolForKey:@"NSFontDefaultScreenFontSubstitutionEnabled"];
#endif
parameters.shouldEnableKerningAndLigaturesByDefault = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
- parameters.shouldEnableFTL = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitFTLEnabledDefaultsKey];
+ parameters.shouldEnableJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCJITEnabledDefaultsKey];
+ parameters.shouldEnableFTL = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLEnabledDefaultsKey];
#if HAVE(HOSTED_CORE_ANIMATION)
#if !PLATFORM(IOS)
Modified: trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (163929 => 163930)
--- trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2014-02-12 03:16:27 UTC (rev 163929)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2014-02-12 03:23:55 UTC (rev 163930)
@@ -173,6 +173,9 @@
m_shouldForceScreenFontSubstitution = parameters.shouldForceScreenFontSubstitution;
Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
+ if (!JSC::Options::useJITWasOverridden())
+ JSC::Options::useJIT() = parameters.shouldEnableJIT;
+
if (!JSC::Options::useFTLJITWasOverridden())
JSC::Options::useFTLJIT() = parameters.shouldEnableFTL;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
