Changeset 163930 in webkit


Ignore:
Timestamp:
Feb 11, 2014 7:23:55 PM (10 years ago)
Author:
weinig@apple.com
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):

Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r163920 r163930  
     12014-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
    1192014-02-11  Ryosuke Niwa  <rniwa@webkit.org>
    220
  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

    r163886 r163930  
    4141    , shouldForceScreenFontSubstitution(false)
    4242    , shouldEnableKerningAndLigaturesByDefault(false)
     43    , shouldEnableJIT(false)
    4344    , shouldEnableFTL(false)
    4445#endif
     
    110111    encoder << shouldForceScreenFontSubstitution;
    111112    encoder << shouldEnableKerningAndLigaturesByDefault;
     113    encoder << shouldEnableJIT;
    112114    encoder << shouldEnableFTL;
    113115#endif
     
    234236    if (!decoder.decode(parameters.shouldEnableKerningAndLigaturesByDefault))
    235237        return false;
     238    if (!decoder.decode(parameters.shouldEnableJIT))
     239        return false;
    236240    if (!decoder.decode(parameters.shouldEnableFTL))
    237241        return false;
  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

    r163886 r163930  
    132132    bool shouldForceScreenFontSubstitution;
    133133    bool shouldEnableKerningAndLigaturesByDefault;
     134    bool shouldEnableJIT;
    134135    bool shouldEnableFTL;
    135136#endif // PLATFORM(COCOA)
  • trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

    r163504 r163930  
    6868NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
    6969NSString *WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey = @"WebKitKerningAndLigaturesEnabledByDefault";
    70 NSString *WebKitFTLEnabledDefaultsKey = @"WebKitFTLEnabledDefaultsKey";
     70NSString *WebKitJSCFTLEnabledDefaultsKey = @"WebKitJSCFTLEnabledDefaultsKey";
     71NSString *WebKitJSCJITEnabledDefaultsKey = @"WebKitJSCJITEnabledDefaultsKey";
    7172
    7273#if !PLATFORM(IOS)
     
    9899#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    99100    [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];
    101103#endif
    102104
     
    156158#endif
    157159    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];
    159162
    160163#if HAVE(HOSTED_CORE_ANIMATION)
  • trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm

    r163794 r163930  
    174174    Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
    175175
     176    if (!JSC::Options::useJITWasOverridden())
     177        JSC::Options::useJIT() = parameters.shouldEnableJIT;
     178
    176179    if (!JSC::Options::useFTLJITWasOverridden())
    177180        JSC::Options::useFTLJIT() = parameters.shouldEnableFTL;
Note: See TracChangeset for help on using the changeset viewer.