Migrate from SystemUIFontSelect to AppleSystemFontOSSubversion
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Mar 2015 02:26:56 +0000 (02:26 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 Mar 2015 02:26:56 +0000 (02:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=142555

Reviewed by Simon Fraser.

* DumpRenderTree/mac/DumpRenderTree.mm:
(setDefaultsToConsistentValuesForTesting):
* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
(WTR::InjectedBundle::platformInitialize):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181359 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTree.mm
Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm

index 45e84b6..d362ab4 100644 (file)
@@ -1,3 +1,15 @@
+2015-03-10  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Migrate from SystemUIFontSelect to AppleSystemFontOSSubversion
+        https://bugs.webkit.org/show_bug.cgi?id=142555
+
+        Reviewed by Simon Fraser.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (setDefaultsToConsistentValuesForTesting):
+        * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
+        (WTR::InjectedBundle::platformInitialize):
+
 2015-03-10  Alex Christensen  <achristensen@webkit.org>
 
         Use unsigned for HashSet size.
index ed177a2..a701ba8 100644 (file)
@@ -936,7 +936,7 @@ static void setDefaultsToConsistentValuesForTesting()
         @"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",
+        @"AppleSystemFontOSSubversion": @(10),
 #endif
     };
 
index 7e83d8c..156c1fa 100644 (file)
@@ -62,7 +62,7 @@ void InjectedBundle::platformInitialize(WKTypeRef)
             @"notationl": @"notational"
         },
 #if __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
-        @"SystemUIFontSelect": @"Neue",
+        @"AppleSystemFontOSSubversion": @(10),
 #endif
     };