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 af902171c32da17009be4a89ecca3f50fe29b639..dedeb9dcbaf02982638ac881ae5158c968bde78d 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 f88b8b1a5aa274f1bbf1630cee8efbc2a90e05da..f276f1387c89548da7f42cebafba7c71b02d8a9e 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 0b7ad720dbb677df72b19cad9a46e567c42faed6..4bac19d9e790e05f848409142e98b3ef34630898 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.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (allowedFontFamilySet):
+
 2014-04-09  Myles C. Maxfield  <mmaxfield@apple.com>
 
         systemHiddenFontFamilySet in DRT is unnecessary
index 12398746afe1c9476fb1c5b75c5846f7c7a6f28d..c14b60a56e0a10c1a9bfd341354577e85f21dfea 100644 (file)
@@ -397,7 +397,6 @@ static NSSet *allowedFontFamilySet()
         @"STKaiti",
         @"STSong",
         @"Symbol",
-        @"System Font",
         @"Tahoma",
         @"Thonburi",
         @"Times New Roman",