Changeset 163504 in webkit


Ignore:
Timestamp:
Feb 5, 2014 6:26:17 PM (10 years ago)
Author:
weinig@apple.com
Message:

[WebKit2, FTL] Add user default to enable the FTL
https://bugs.webkit.org/show_bug.cgi?id=128281

Reviewed by Geoffrey Garen.

  • 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):
Pipe through the default.

Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r163501 r163504  
     12014-02-05  Sam Weinig  <sam@webkit.org>
     2
     3        [WebKit2, FTL] Add user default to enable the FTL
     4        https://bugs.webkit.org/show_bug.cgi?id=128281
     5
     6        Reviewed by Geoffrey Garen.
     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        Pipe through the default.
     19
    1202014-02-05  Anders Carlsson  <andersca@apple.com>
    221
  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

    r163121 r163504  
    4141    , shouldForceScreenFontSubstitution(false)
    4242    , shouldEnableKerningAndLigaturesByDefault(false)
     43    , shouldEnableFTL(false)
    4344#endif
    4445#if ENABLE(NETWORK_PROCESS)
     
    109110    encoder << shouldForceScreenFontSubstitution;
    110111    encoder << shouldEnableKerningAndLigaturesByDefault;
     112    encoder << shouldEnableFTL;
    111113#endif
    112114
     
    232234    if (!decoder.decode(parameters.shouldEnableKerningAndLigaturesByDefault))
    233235        return false;
     236    if (!decoder.decode(parameters.shouldEnableFTL))
     237        return false;
    234238#endif
    235239
  • trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

    r163121 r163504  
    132132    bool shouldForceScreenFontSubstitution;
    133133    bool shouldEnableKerningAndLigaturesByDefault;
     134    bool shouldEnableFTL;
    134135#endif // PLATFORM(MAC)
    135136
  • trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

    r163079 r163504  
    6868NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
    6969NSString *WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey = @"WebKitKerningAndLigaturesEnabledByDefault";
     70NSString *WebKitFTLEnabledDefaultsKey = @"WebKitFTLEnabledDefaultsKey";
    7071
    7172#if !PLATFORM(IOS)
     
    9798#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    9899    [registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
     100    [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitFTLEnabledDefaultsKey];
    99101#endif
    100102
     
    154156#endif
    155157    parameters.shouldEnableKerningAndLigaturesByDefault = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
     158    parameters.shouldEnableFTL = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitFTLEnabledDefaultsKey];
    156159
    157160#if HAVE(HOSTED_CORE_ANIMATION)
  • trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm

    r161272 r163504  
    3737#import "WebProcessCreationParameters.h"
    3838#import "WebProcessProxyMessages.h"
     39#import <JavaScriptCore/Options.h>
    3940#import <WebCore/AXObjectCache.h>
    4041#import <WebCore/FileSystem.h>
     
    173174    Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
    174175
     176    JSC::Options::useFTLJIT() = parameters.shouldEnableFTL;
     177
    175178    m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
    176179
Note: See TracChangeset for help on using the changeset viewer.