Remove "System Font" from whitelisted DRT fonts and char width calculations
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Apr 2014 22:54:26 +0000 (22:54 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Apr 2014 22:54:26 +0000 (22:54 +0000)
https://bugs.webkit.org/show_bug.cgi?id=131411

Reviewed by Tim Horton.

Covered by existing tests.

Source/WebCore:

* platform/graphics/Font.cpp:
(WebCore::Font::hasValidAverageCharWidth):

Tools:

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

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

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/Font.cpp
Tools/ChangeLog
Tools/DumpRenderTree/mac/DumpRenderTree.mm

index af90217..dedeb9d 100644 (file)
@@ -1,3 +1,15 @@
+2014-04-09  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Remove "System Font" from whitelisted DRT fonts and char width calculations
+        https://bugs.webkit.org/show_bug.cgi?id=131411
+
+        Reviewed by Tim Horton.
+
+        Covered by existing tests.
+
+        * platform/graphics/Font.cpp:
+        (WebCore::Font::hasValidAverageCharWidth):
+
 2014-04-09  Jeremy Jones  <jeremyj@apple.com>
 
         Fullscreen does two view controller changes at once
index f88b8b1..f276f13 100644 (file)
@@ -484,7 +484,7 @@ bool Font::hasValidAverageCharWidth() const
     // Internal fonts on OS X also have an invalid entry in the table for avgCharWidth.
     // They are hidden by having a name that begins with a period, so simply search
     // for that here rather than try to keep the list up to date.
-    if (family.startsWith('.') || family == "System Font")
+    if (family.startsWith('.'))
         return false;
 
     static HashSet<AtomicString>* fontFamiliesWithInvalidCharWidthMap = 0;
index 0b7ad72..4bac19d 100644 (file)
@@ -1,5 +1,17 @@
 2014-04-09  Myles C. Maxfield  <mmaxfield@apple.com>
 
+        Remove "System Font" from whitelisted DRT fonts and char width calculations
+        https://bugs.webkit.org/show_bug.cgi?id=131411
+
+        Reviewed by Tim Horton.
+
+        Covered by existing tests.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (allowedFontFamilySet):
+
+2014-04-09  Myles C. Maxfield  <mmaxfield@apple.com>
+
         systemHiddenFontFamilySet in DRT is unnecessary
         https://bugs.webkit.org/show_bug.cgi?id=131414
 
index 1239874..c14b60a 100644 (file)
@@ -397,7 +397,6 @@ static NSSet *allowedFontFamilySet()
         @"STKaiti",
         @"STSong",
         @"Symbol",
-        @"System Font",
         @"Tahoma",
         @"Thonburi",
         @"Times New Roman",