Title: [163546] tags/Safari-538.16.2/Source/WebKit2
Diff
Modified: tags/Safari-538.16.2/Source/WebKit2/ChangeLog (163545 => 163546)
--- tags/Safari-538.16.2/Source/WebKit2/ChangeLog 2014-02-06 18:08:38 UTC (rev 163545)
+++ tags/Safari-538.16.2/Source/WebKit2/ChangeLog 2014-02-06 18:10:04 UTC (rev 163546)
@@ -1,3 +1,26 @@
+2014-02-06 Lucas Forschler <[email protected]>
+
+ Merge r163504
+
+ 2014-02-05 Sam Weinig <[email protected]>
+
+ [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.
+
2014-02-03 Krzysztof Czech <[email protected]>
Build fix after r163289.
Modified: tags/Safari-538.16.2/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (163545 => 163546)
--- tags/Safari-538.16.2/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-02-06 18:08:38 UTC (rev 163545)
+++ tags/Safari-538.16.2/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-02-06 18:10:04 UTC (rev 163546)
@@ -40,6 +40,7 @@
, nsURLCacheDiskCapacity(0)
, shouldForceScreenFontSubstitution(false)
, shouldEnableKerningAndLigaturesByDefault(false)
+ , shouldEnableFTL(false)
#endif
#if ENABLE(NETWORK_PROCESS)
, usesNetworkProcess(false)
@@ -108,6 +109,7 @@
encoder << uiProcessBundleResourcePathExtensionHandle;
encoder << shouldForceScreenFontSubstitution;
encoder << shouldEnableKerningAndLigaturesByDefault;
+ encoder << shouldEnableFTL;
#endif
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
@@ -231,6 +233,8 @@
return false;
if (!decoder.decode(parameters.shouldEnableKerningAndLigaturesByDefault))
return false;
+ if (!decoder.decode(parameters.shouldEnableFTL))
+ return false;
#endif
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
Modified: tags/Safari-538.16.2/Source/WebKit2/Shared/WebProcessCreationParameters.h (163545 => 163546)
--- tags/Safari-538.16.2/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-02-06 18:08:38 UTC (rev 163545)
+++ tags/Safari-538.16.2/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-02-06 18:10:04 UTC (rev 163546)
@@ -131,6 +131,7 @@
bool shouldForceScreenFontSubstitution;
bool shouldEnableKerningAndLigaturesByDefault;
+ bool shouldEnableFTL;
#endif // PLATFORM(MAC)
#if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
Modified: tags/Safari-538.16.2/Source/WebKit2/UIProcess/mac/WebContextMac.mm (163545 => 163546)
--- tags/Safari-538.16.2/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-02-06 18:08:38 UTC (rev 163545)
+++ tags/Safari-538.16.2/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-02-06 18:10:04 UTC (rev 163546)
@@ -67,6 +67,7 @@
NSString *WebKitLocalCacheDefaultsKey = @"WebKitLocalCache";
NSString *WebStorageDirectoryDefaultsKey = @"WebKitLocalStorageDatabasePathPreferenceKey";
NSString *WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey = @"WebKitKerningAndLigaturesEnabledByDefault";
+NSString *WebKitFTLEnabledDefaultsKey = @"WebKitFTLEnabledDefaultsKey";
#if !PLATFORM(IOS)
static NSString *WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification = @"NSApplicationDidChangeAccessibilityEnhancedUserInterfaceNotification";
@@ -96,6 +97,7 @@
#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
[registrationDictionary setObject:[NSNumber numberWithBool:YES] forKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
+ [registrationDictionary setObject:[NSNumber numberWithBool:NO] forKey:WebKitFTLEnabledDefaultsKey];
#endif
[[NSUserDefaults standardUserDefaults] registerDefaults:registrationDictionary];
@@ -153,6 +155,7 @@
parameters.shouldForceScreenFontSubstitution = [[NSUserDefaults standardUserDefaults] boolForKey:@"NSFontDefaultScreenFontSubstitutionEnabled"];
#endif
parameters.shouldEnableKerningAndLigaturesByDefault = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitKerningAndLigaturesEnabledByDefaultDefaultsKey];
+ parameters.shouldEnableFTL = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitFTLEnabledDefaultsKey];
#if HAVE(HOSTED_CORE_ANIMATION)
#if !PLATFORM(IOS)
Modified: tags/Safari-538.16.2/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (163545 => 163546)
--- tags/Safari-538.16.2/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2014-02-06 18:08:38 UTC (rev 163545)
+++ tags/Safari-538.16.2/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2014-02-06 18:10:04 UTC (rev 163546)
@@ -36,6 +36,7 @@
#import "WebPage.h"
#import "WebProcessCreationParameters.h"
#import "WebProcessProxyMessages.h"
+#import <_javascript_Core/Options.h>
#import <WebCore/AXObjectCache.h>
#import <WebCore/FileSystem.h>
#import <WebCore/Font.h>
@@ -172,6 +173,8 @@
m_shouldForceScreenFontSubstitution = parameters.shouldForceScreenFontSubstitution;
Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
+ JSC::Options::useFTLJIT() = parameters.shouldEnableFTL;
+
m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();
m_presenterApplicationPid = parameters.presenterApplicationPid;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
