Tweak how AppleSystemFontOSSubversion default is added
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Mar 2015 20:42:11 +0000 (20:42 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 18 Mar 2015 20:42:11 +0000 (20:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=142835

Reviewed by Dan Bernstein.

* DumpRenderTree/mac/DumpRenderTree.mm:
(setDefaultsToConsistentValuesForTesting):

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

Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTree.mm

index d395a79..c001f4b 100644 (file)
@@ -1,3 +1,13 @@
+2015-03-18  Alexey Proskuryakov  <ap@apple.com>
+
+        Tweak how AppleSystemFontOSSubversion default is added
+        https://bugs.webkit.org/show_bug.cgi?id=142835
+
+        Reviewed by Dan Bernstein.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (setDefaultsToConsistentValuesForTesting):
+
 2015-03-18  Dan Bernstein  <mitz@apple.com>
 
         prepare-ChangeLog doesn't understand C string literals split across multiple lines with \
index 7148f3d..e22e3a7 100644 (file)
@@ -993,7 +993,11 @@ static void setDefaultsToConsistentValuesForTesting()
     NSDictionary *processInstanceDefaults = @{
         WebDatabaseDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"Databases"],
         WebStorageDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalStorage"],
-        WebKitLocalCacheDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalCache"]
+        WebKitLocalCacheDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalCache"],
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
+        // This needs to also be added to argument domain because of <rdar://problem/20210002>.
+        @"AppleSystemFontOSSubversion": @(10),
+#endif
     };
 
     [[NSUserDefaults standardUserDefaults] setVolatileDomain:processInstanceDefaults forName:NSArgumentDomain];