Title: [152146] branches/safari-537-branch/Tools
- Revision
- 152146
- Author
- lforsch...@apple.com
- Date
- 2013-06-27 18:17:44 -0700 (Thu, 27 Jun 2013)
Log Message
Merged r152144. <rdar://problem/13529880>
Modified Paths
Diff
Modified: branches/safari-537-branch/Tools/ChangeLog (152145 => 152146)
--- branches/safari-537-branch/Tools/ChangeLog 2013-06-28 01:16:13 UTC (rev 152145)
+++ branches/safari-537-branch/Tools/ChangeLog 2013-06-28 01:17:44 UTC (rev 152146)
@@ -1,5 +1,33 @@
2013-06-27 Lucas Forschler <lforsch...@apple.com>
+ Merge r152144
+
+ 2013-06-26 Dean Jackson <d...@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 Lucas Forschler <lforsch...@apple.com>
+
Merge r151954
2013-06-24 Dean Jackson <d...@apple.com>
Modified: branches/safari-537-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (152145 => 152146)
--- branches/safari-537-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2013-06-28 01:16:13 UTC (rev 152145)
+++ branches/safari-537-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2013-06-28 01:17:44 UTC (rev 152146)
@@ -236,7 +236,7 @@
static NSSet *allowedFontFamilySet()
{
- static NSSet *fontFamiliySet = [[NSSet setWithObjects:
+ static NSSet *fontFamilySet = [[NSSet setWithObjects:
@"Ahem",
@"Al Bayan",
@"American Typewriter",
@@ -355,9 +355,18 @@
@"Zapfino",
nil] retain];
- return fontFamiliySet;
+ return fontFamilySet;
}
+static NSSet *systemHiddenFontFamilySet()
+{
+ static NSSet *fontFamilySet = [[NSSet setWithObjects:
+ @".LucidaGrandeUI",
+ nil] retain];
+
+ return fontFamilySet;
+}
+
static IMP appKitAvailableFontFamiliesIMP;
static IMP appKitAvailableFontsIMP;
@@ -391,7 +400,11 @@
[availableFontList addObject:[fontInfo objectAtIndex:0]];
}
}
-
+
+ for (NSString *hiddenFontFamily in systemHiddenFontFamilySet()) {
+ [availableFontList addObject:hiddenFontFamily];
+ }
+
availableFonts = availableFontList;
return availableFonts;
}
Modified: branches/safari-537-branch/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm (152145 => 152146)
--- branches/safari-537-branch/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm 2013-06-28 01:16:13 UTC (rev 152145)
+++ branches/safari-537-branch/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm 2013-06-28 01:17:44 UTC (rev 152146)
@@ -42,7 +42,7 @@
static NSSet *allowedFontFamilySet()
{
- static NSSet *fontFamiliySet = [[NSSet setWithObjects:
+ static NSSet *fontFamilySet = [[NSSet setWithObjects:
@"Ahem",
@"Al Bayan",
@"American Typewriter",
@@ -161,9 +161,18 @@
@"Zapfino",
nil] retain];
- return fontFamiliySet;
+ return fontFamilySet;
}
+static NSSet *systemHiddenFontFamilySet()
+{
+ static NSSet *fontFamilySet = [[NSSet setWithObjects:
+ @".LucidaGrandeUI",
+ nil] retain];
+
+ return fontFamilySet;
+}
+
static IMP appKitAvailableFontFamiliesIMP;
static IMP appKitAvailableFontsIMP;
@@ -197,7 +206,11 @@
[availableFontList addObject:[fontInfo objectAtIndex:0]];
}
}
-
+
+ for (NSString *hiddenFontFamily in systemHiddenFontFamilySet()) {
+ [availableFontList addObject:hiddenFontFamily];
+ }
+
availableFonts = availableFontList;
return availableFonts;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
