[iOS] Cherokee language is drawn as boxes

https://bugs.webkit.org/show_bug.cgi?id=139706

Reviewed by Simon Fraser.

Source/WebCore:

Test: platform/ios-simulator/fast/text/cherokee.html

* platform/graphics/ios/FontCacheIOS.mm:
(WebCore::languageSpecificFallbackFont):

LayoutTests:

* platform/ios-simulator/fast/text/cherokee-expected.html: Added.
* platform/ios-simulator/fast/text/cherokee.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@177404 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7ca3abe38232516af1a1264ca2e035c975fcd7fe..86e90f341d730afb7b58d9b9009782b446947534 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-16  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [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.
+
 2014-12-16  Alexey Proskuryakov  <ap@apple.com>
 
         https://bugs.webkit.org/show_bug.cgi?id=139708

diff --git a/LayoutTests/platform/ios-simulator/fast/text/cherokee-expected.html b/LayoutTests/platform/ios-simulator/fast/text/cherokee-expected.html
new file mode 100644 (file)
index 0000000..209f5ea
--- /dev/null
+++ b/LayoutTests/platform/ios-simulator/fast/text/cherokee-expected.html
@@ -0,0 +1,2 @@
+<meta charset="utf-8">
+<div style="font-family: Helvetica; font-size: 150px;">ᏫᎩᏇᏗᏯ</div>

diff --git a/LayoutTests/platform/ios-simulator/fast/text/cherokee.html b/LayoutTests/platform/ios-simulator/fast/text/cherokee.html
new file mode 100644 (file)
index 0000000..1422d0a
--- /dev/null
+++ b/LayoutTests/platform/ios-simulator/fast/text/cherokee.html
@@ -0,0 +1,2 @@
+<meta charset="utf-8">
+<div style="font-size: 150px;">ᏫᎩᏇᏗᏯ</div>

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 794bd0dbed61cf48c0516905b7ac0bae4390679b..08e19b241de865c97d2c5b16fc653641b2f1b543 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2014-12-16  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [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):
+
 2014-12-16  Enrica Casucci  <enrica@apple.com>
 
         Fix iOS builders for 8.0

diff --git a/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm b/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
index 8b36a429b5e3b1873a1e8324cad5ef19ee925a4a..3f6f7e41fd9abc0e2f1a1aaf03b69459ac3fba9a 100644 (file)
--- a/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
+++ b/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
@@ -149,8 +149,8 @@ static LanguageSpecificFont languageSpecificFallbackFont(UChar32 c)
         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)