Title: [179140] branches/safari-600.1.4.15-branch
- Revision
- 179140
- Author
- [email protected]
- Date
- 2015-01-26 13:29:59 -0800 (Mon, 26 Jan 2015)
Log Message
Merged r177404. rdar://problem/19419787
Modified Paths
Added Paths
Diff
Modified: branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog (179139 => 179140)
--- branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-26 21:26:20 UTC (rev 179139)
+++ branches/safari-600.1.4.15-branch/LayoutTests/ChangeLog 2015-01-26 21:29:59 UTC (rev 179140)
@@ -1,5 +1,19 @@
2015-01-26 David Kilzer <[email protected]>
+ Merge r177404.
+
+ 2014-12-16 Myles C. Maxfield <[email protected]>
+
+ [iOS] Cherokee language is drawn as boxes
+ https://bugs.webkit.org/show_bug.cgi?id=139706
+
+ Reviewed by Simon Fraser.
+
+ * platform/ios-simulator/fast/text/cherokee-expected.html: Added.
+ * platform/ios-simulator/fast/text/cherokee.html: Added.
+
+2015-01-26 David Kilzer <[email protected]>
+
Merge r177408.
2014-12-16 Myles C. Maxfield <[email protected]>
Added: branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/cherokee-expected.html (0 => 179140)
--- branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/cherokee-expected.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/cherokee-expected.html 2015-01-26 21:29:59 UTC (rev 179140)
@@ -0,0 +1,2 @@
+<meta charset="utf-8">
+<div style="font-family: Helvetica; font-size: 150px;">ᏫᎩᏇᏗᏯ</div>
Added: branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/cherokee.html (0 => 179140)
--- branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/cherokee.html (rev 0)
+++ branches/safari-600.1.4.15-branch/LayoutTests/platform/ios-simulator/fast/text/cherokee.html 2015-01-26 21:29:59 UTC (rev 179140)
@@ -0,0 +1,2 @@
+<meta charset="utf-8">
+<div style="font-size: 150px;">ᏫᎩᏇᏗᏯ</div>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179139 => 179140)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-26 21:26:20 UTC (rev 179139)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-26 21:29:59 UTC (rev 179140)
@@ -1,5 +1,21 @@
2015-01-26 David Kilzer <[email protected]>
+ Merge r177404.
+
+ 2014-12-16 Myles C. Maxfield <[email protected]>
+
+ [iOS] Cherokee language is drawn as boxes
+ https://bugs.webkit.org/show_bug.cgi?id=139706
+
+ Reviewed by Simon Fraser.
+
+ Test: platform/ios-simulator/fast/text/cherokee.html
+
+ * platform/graphics/ios/FontCacheIOS.mm:
+ (WebCore::languageSpecificFallbackFont):
+
+2015-01-26 David Kilzer <[email protected]>
+
Merge r177398.
2014-12-16 Myles C. Maxfield <[email protected]>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (179139 => 179140)
--- branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-01-26 21:26:20 UTC (rev 179139)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2015-01-26 21:29:59 UTC (rev 179140)
@@ -151,8 +151,8 @@
return LanguageSpecificFont::None;
if (c < 0x1200)
return LanguageSpecificFont::Korean;
- if (c < 0x1401)
- return LanguageSpecificFont::Khmer; // FIXME: These codepoints don't belong to Khmer
+ if (c < 0x1400)
+ return LanguageSpecificFont::None;
if (c < 0x1780)
return LanguageSpecificFont::CanadianAboriginalSyllabic;
if (c < 0x1800)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
