Add "System Font" to the list of whitelisted DRT fonts

https://bugs.webkit.org/show_bug.cgi?id=130046

Reviewed by Darin Adler.

* DumpRenderTree/mac/DumpRenderTree.mm:
(allowedFontFamilySet):
* WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 9e612ce644e39b6f8b336adc4f4e7f5553546d00..a3ca20f32f103a9be2a4dea829bf544642d85db4 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2014-03-10  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Add "System Font" to the list of whitelisted DRT fonts
+        https://bugs.webkit.org/show_bug.cgi?id=130046
+
+        Reviewed by Darin Adler.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (allowedFontFamilySet):
+        * WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:
+
 2014-03-11  Martin Robinson  <mrobinson@igalia.com>
 
         [GTK] The jhbuild environment should set CMAKE_PREFIX_PATH and CMAKE_LIBRARY_PATH

diff --git a/Tools/DumpRenderTree/mac/DumpRenderTree.mm b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
index 8655bd4f7f633e249cf4c9797e2d5ecc8aa3880b..9ad1ff26b6c157f78e3a3f8850f8cdb881d90712 100644 (file)
--- a/Tools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/Tools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -397,6 +397,7 @@ static NSSet *allowedFontFamilySet()
         @"STKaiti",
         @"STSong",
         @"Symbol",
+        @"System Font",
         @"Tahoma",
         @"Thonburi",
         @"Times New Roman",

diff --git a/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm b/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm
index fe1ef1ef131b6da9cba7ab6ab0036611b0882956..a968d709a3ea1066560e5b775d3176e49baf6ff9 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm
+++ b/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm
@@ -146,6 +146,7 @@ static NSSet *allowedFontFamilySet()
         @"STKaiti",
         @"STSong",
         @"Symbol",
+        @"System Font",
         @"Tahoma",
         @"Thonburi",
         @"Times New Roman",