Changeset 163930 in webkit
- Timestamp:
- Feb 11, 2014 7:23:55 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r163920 r163930 1 2014-02-11 Sam Weinig <sam@webkit.org> 2 3 [WebKit2, JSC] Add user default to disable the JIT 4 https://bugs.webkit.org/show_bug.cgi?id=128643 5 6 Reviewed by Filip Pizlo. 7 8 * Shared/WebProcessCreationParameters.cpp: 9 (WebKit::WebProcessCreationParameters::WebProcessCreationParameters): 10 (WebKit::WebProcessCreationParameters::encode): 11 (WebKit::WebProcessCreationParameters::decode): 12 * Shared/WebProcessCreationParameters.h: 13 * UIProcess/mac/WebContextMac.mm: 14 (WebKit::registerUserDefaultsIfNeeded): 15 (WebKit::WebContext::platformInitializeWebProcess): 16 * WebProcess/mac/WebProcessMac.mm: 17 (WebKit::WebProcess::platformInitializeWebProcess): 18 1 19 2014-02-11 Ryosuke Niwa <rniwa@webkit.org> 2 20 -
trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp
r163886 r163930 41 41 , shouldForceScreenFontSubstitution(false) 42 42 , shouldEnableKerningAndLigaturesByDefault(false) 43 , shouldEnableJIT(false) 43 44 , shouldEnableFTL(false) 44 45 #endif … … 110 111 encoder << shouldForceScreenFontSubstitution; 111 112 encoder << shouldEnableKerningAndLigaturesByDefault; 113 encoder << shouldEnableJIT; 112 114 encoder << shouldEnableFTL; 113 115 #endif … … 234 236 if (!decoder.decode(parameters.shouldEnableKerningAndLigaturesByDefault)) 235 237 return false; 238 if (!decoder.decode(parameters.shouldEnableJIT)) 239 return false; 236 240 if (!decoder.decode(parameters.shouldEnableFTL)) 237 241 return false; -
trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h
r163886 r163930 132 132 bool shouldForceScreenFontSubstitution; 133 133 bool shouldEnableKerningAndLigaturesByDefault; 134 bool shouldEnableJIT; 134 135 bool shouldEnableFTL; 135 136 #endif // PLATFORM(COCOA) -
trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm
r163504 r163930 68 68 NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey"; 69 69 NSString *WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey = @"WebKitKerningAndLigaturesEnabledByDefault"; 70 NSString *WebKitFTLEnabledDefaultsKey = @"WebKitFTLEnabledDefaultsKey"; 70 NSString *WebKitJSCFTLEnabledDefaultsKey = @"WebKitJSCFTLEnabledDefaultsKey"; 71 NSString *WebKitJSCJITEnabledDefaultsKey = @"WebKitJSCJITEnabledDefaultsKey"; 71 72 72 73 #if !PLATFORM(IOS) … … 98 99 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 99 100 [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey]; 100 [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitFTLEnabledDefaultsKey]; 101 [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitJSCJITEnabledDefaultsKey]; 102 [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitJSCFTLEnabledDefaultsKey]; 101 103 #endif 102 104 … … 156 158 #endif 157 159 parameters.shouldEnableKerningAndLigaturesByDefault = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey]; 158 parameters.shouldEnableFTL = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitFTLEnabledDefaultsKey]; 160 parameters.shouldEnableJIT = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCJITEnabledDefaultsKey]; 161 parameters.shouldEnableFTL = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitJSCFTLEnabledDefaultsKey]; 159 162 160 163 #if HAVE(HOSTED_CORE_ANIMATION) -
trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm
r163794 r163930 174 174 Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0); 175 175 176 if (!JSC::Options::useJITWasOverridden()) 177 JSC::Options::useJIT() = parameters.shouldEnableJIT; 178 176 179 if (!JSC::Options::useFTLJITWasOverridden()) 177 180 JSC::Options::useFTLJIT() = parameters.shouldEnableFTL;
Note: See TracChangeset
for help on using the changeset viewer.