Title: [152145] branches/safari-537-branch/Tools
- Revision
- 152145
- Author
- lforsch...@apple.com
- Date
- 2013-06-27 18:16:13 -0700 (Thu, 27 Jun 2013)
Log Message
Merged r151954. <rdar://problem/14250356>
Modified Paths
Diff
Modified: branches/safari-537-branch/Tools/ChangeLog (152144 => 152145)
--- branches/safari-537-branch/Tools/ChangeLog 2013-06-28 01:02:03 UTC (rev 152144)
+++ branches/safari-537-branch/Tools/ChangeLog 2013-06-28 01:16:13 UTC (rev 152145)
@@ -1,3 +1,22 @@
+2013-06-27 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r151954
+
+ 2013-06-24 Dean Jackson <d...@apple.com>
+
+ [Mac] Update font used for Chinese in test systems
+ https://bugs.webkit.org/show_bug.cgi?id=117970
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add "Songti TC" and "Songti SC" to the list of allowed fonts
+ in DRT and WKTR.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (allowedFontFamilySet):
+ * WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm:
+ (WTR::allowedFontFamilySet):
+
2013-06-26 Lucas Forschler <lforsch...@apple.com>
Merge r151832
Modified: branches/safari-537-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm (152144 => 152145)
--- branches/safari-537-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2013-06-28 01:02:03 UTC (rev 152144)
+++ branches/safari-537-branch/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2013-06-28 01:16:13 UTC (rev 152145)
@@ -331,6 +331,8 @@
@"Sathu",
@"Silom",
@"Skia",
+ @"Songti SC",
+ @"Songti TC",
@"STFangsong",
@"STHeiti",
@"STIXGeneral",
Modified: branches/safari-537-branch/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm (152144 => 152145)
--- branches/safari-537-branch/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm 2013-06-28 01:02:03 UTC (rev 152144)
+++ branches/safari-537-branch/Tools/WebKitTestRunner/InjectedBundle/mac/ActivateFonts.mm 2013-06-28 01:16:13 UTC (rev 152145)
@@ -137,6 +137,8 @@
@"Sathu",
@"Silom",
@"Skia",
+ @"Songti SC",
+ @"Songti TC",
@"STFangsong",
@"STHeiti",
@"STIXGeneral",
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
