Title: [181052] trunk/Tools
- Revision
- 181052
- Author
- [email protected]
- Date
- 2015-03-04 16:51:44 -0800 (Wed, 04 Mar 2015)
Log Message
[Mac] Set SystemUIFontSelect in DRT and WKTR
https://bugs.webkit.org/show_bug.cgi?id=142303
Reviewed by Myles C. Maxfield.
* DumpRenderTree/mac/DumpRenderTree.mm:
(setDefaultsToConsistentValuesForTesting):
* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
(WTR::InjectedBundle::platformInitialize):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (181051 => 181052)
--- trunk/Tools/ChangeLog 2015-03-05 00:11:01 UTC (rev 181051)
+++ trunk/Tools/ChangeLog 2015-03-05 00:51:44 UTC (rev 181052)
@@ -1,3 +1,15 @@
+2015-03-04 Alexey Proskuryakov <[email protected]>
+
+ [Mac] Set SystemUIFontSelect in DRT and WKTR
+ https://bugs.webkit.org/show_bug.cgi?id=142303
+
+ Reviewed by Myles C. Maxfield.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (setDefaultsToConsistentValuesForTesting):
+ * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+ (WTR::InjectedBundle::platformInitialize):
+
2015-03-04 Chris Dumez <[email protected]>
Mac Perf bots should use WebKitTestRunner instead of DumpRenderTree
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (181051 => 181052)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-03-05 00:11:01 UTC (rev 181051)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-03-05 00:51:44 UTC (rev 181052)
@@ -935,10 +935,18 @@
@"NSOverlayScrollersEnabled": @NO,
@"AppleShowScrollBars": @"Always",
@"NSButtonAnimationsEnabled": @NO, // Ideally, we should find a way to test animations, but for now, make sure that the dumped snapshot matches actual state.
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
+ @"SystemUIFontSelect": @"Neue",
+#endif
};
[[NSUserDefaults standardUserDefaults] setValuesForKeysWithDictionary:dict];
+#if PLATFORM(MAC)
+ // Make NSFont use the new defaults.
+ [NSFont initialize];
+#endif
+
NSDictionary *processInstanceDefaults = @{
WebDatabaseDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"Databases"],
WebStorageDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalStorage"],
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (181051 => 181052)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2015-03-05 00:11:01 UTC (rev 181051)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2015-03-05 00:51:44 UTC (rev 181052)
@@ -45,8 +45,7 @@
NSDictionary *dict = @{
@"AppleAntiAliasingThreshold": @4,
// FIXME: Setting AppleFontSmoothing is likely unnecessary and ineffective. WebKit2 has its own preference for font smoothing, which is
- // applied to each context via CGContextSetShouldSmoothFonts, presumably overriding the default. And it's too late to do this here,
- // see <https://bugs.webkit.org/show_bug.cgi?id=123488>
+ // applied to each context via CGContextSetShouldSmoothFonts, presumably overriding the default.
@"AppleFontSmoothing": @(NoFontSmoothing),
@"AppleAquaColorVariant": @(BlueTintedAppearance),
@"AppleHighlightColor": @"0.709800 0.835300 1.000000",
@@ -61,11 +60,17 @@
// FIXME: Why does this dictionary not match the one in DumpRenderTree?
@"NSTestCorrectionDictionary": @{
@"notationl": @"notational"
- }
+ },
+#if __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
+ @"SystemUIFontSelect": @"Neue",
+#endif
};
[[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgumentDomain];
+ // Make NSFont use the new defaults.
+ [NSFont initialize];
+
// Underlying frameworks have already read AppleAntiAliasingThreshold default before we changed it.
// A distributed notification is delivered to all applications, but it should be harmless, and it's the only way to update all underlying frameworks anyway.
[[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"AppleAquaAntiAliasingChanged" object:nil userInfo:nil deliverImmediately:YES];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
