Changeset 152144 in webkit

Timestamp:

Jun 27, 2013 6:02:03 PM (11 years ago)

Author:

dino@apple.com

Message:

[Mac] Add Mavericks system font to Test systems
​https://bugs.webkit.org/show_bug.cgi?id=118109

Reviewed by Simon Fraser.

OS X Mavericks uses a different font for system controls. Tell DRT and
WKTR about them otherwise they use a fallback font. Unfortunately the
fonts are hidden (not found in the list of available fonts) so I
had to add them manually.

Even though there is only one at the moment, I implemented this
as a set so it will be easier to add new fonts if necessary.

• DumpRenderTree/mac/DumpRenderTree.mm:

(allowedFontFamilySet): Fixed typo.
(systemHiddenFontFamilySet): New method that returns the system control font.
(drt_NSFontManager_availableFonts): Merge the hidden fonts.

• WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:

(WTR::allowedFontFamilySet): Fixed typo.
(WTR::systemHiddenFontFamilySet): As above.
(WTR::wtr_NSFontManager_availableFonts):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/DumpRenderTree.mm (modified) (3 diffs)
• WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-06-26  Dean Jackson  <dino@apple.com>
+
+        [Mac] Add Mavericks system font to Test systems
+        https://bugs.webkit.org/show_bug.cgi?id=118109
+
+        Reviewed by Simon Fraser.
+
+        OS X Mavericks uses a different font for system controls. Tell DRT and
+        WKTR about them otherwise they use a fallback font. Unfortunately the
+        fonts are hidden (not found in the list of available fonts) so I
+        had to add them manually.
+
+        Even though there is only one at the moment, I implemented this
+        as a set so it will be easier to add new fonts if necessary.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (allowedFontFamilySet): Fixed typo.
+        (systemHiddenFontFamilySet): New method that returns the system control font.
+        (drt_NSFontManager_availableFonts): Merge the hidden fonts.
+        * WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:
+        (WTR::allowedFontFamilySet): Fixed typo.
+        (WTR::systemHiddenFontFamilySet): As above.
+        (WTR::wtr_NSFontManager_availableFonts):
+
 2013-06-27  Anders Carlsson  <andersca@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -237 +237 @@
 static NSSet *allowedFontFamilySet()
 {
-    static NSSet *fontFamiliySet = [[NSSet setWithObjects:
+    static NSSet *fontFamilySet = [[NSSet setWithObjects:
         @"Ahem",
         @"Al Bayan",
@@ -356 +356 @@
         nil] retain];
     
-    return fontFamiliySet;
+    return fontFamilySet;
+}
+
+static NSSet *systemHiddenFontFamilySet()
+{
+    static NSSet *fontFamilySet = [[NSSet setWithObjects:
+        @".LucidaGrandeUI",
+        nil] retain];
+
+    return fontFamilySet;
 }
 
@@ -392 +401 @@
         }
     }
-    
+
+    for (NSString *hiddenFontFamily in systemHiddenFontFamilySet()) {
+        [availableFontList addObject:hiddenFontFamily];
+    }
+
     availableFonts = availableFontList;
     return availableFonts;

trunk/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm

@@ -43 +43 @@
 static NSSet *allowedFontFamilySet()
 {
-    static NSSet *fontFamiliySet = [[NSSet setWithObjects:
+    static NSSet *fontFamilySet = [[NSSet setWithObjects:
         @"Ahem",
         @"Al Bayan",
@@ -162 +162 @@
         nil] retain];
     
-    return fontFamiliySet;
+    return fontFamilySet;
+}
+
+static NSSet *systemHiddenFontFamilySet()
+{
+    static NSSet *fontFamilySet = [[NSSet setWithObjects:
+        @".LucidaGrandeUI",
+        nil] retain];
+
+    return fontFamilySet;
 }
 
@@ -198 +207 @@
         }
     }
-    
+
+    for (NSString *hiddenFontFamily in systemHiddenFontFamilySet()) {
+        [availableFontList addObject:hiddenFontFamily];
+    }
+
     availableFonts = availableFontList;
     return availableFonts;