All Indic text is rendered as boxes on iOS

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

Reviewed by Simon Fraser.

Source/WebCore:
I made a typo in r170207.

Test: fast/text/indic.html

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

LayoutTests:
Simply draw some indic text and test that against currently good metric values.

* fast/text/indic.html: Added
* platform/ios-sim/fast/text/indic-expected.txt: Added.
* platform/mac/fast/text/indic-expected.txt: Added.
* platform/mac/fast/text/indic-expected.png: Added.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b7ab0299cf167f5edd28c5865acd4d15f7d1751b..4aaf51dea5eac5317d4b21f2a6cbcded2f20560c 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2014-06-30  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        All Indic text is rendered as boxes on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=134464
+
+        Reviewed by Simon Fraser.
+
+        Simply draw some indic text and test that against currently good metric values.
+
+        * fast/text/indic.html: Added
+        * platform/ios-sim/fast/text/indic-expected.txt: Added.
+        * platform/mac/fast/text/indic-expected.txt: Added.
+        * platform/mac/fast/text/indic-expected.png: Added.
+
 2014-06-30  Michael Saboff  <msaboff@apple.com>
 
         js/script-tests/function-apply-many-args.js fails on ARM

diff --git a/LayoutTests/fast/text/indic.html b/LayoutTests/fast/text/indic.html
new file mode 100644 (file)
index 0000000..73862bd
--- /dev/null
+++ b/LayoutTests/fast/text/indic.html
@@ -0,0 +1,3 @@
+<meta charset="utf-8"> This page renders some indic text and makes sure that the text metrics match the expected metrics.
+<br>
+ઠળના ઇરાકી પ્રદેશોને ઇસ્લામિક રાષ્ટ્ર જાહેર કર્યું છે અને પોતાનો વ્યાપ વધારવા તેમના વડા પ્રત્યે વફાદારીનું વિશ્વભરના મુસ્લિમોને આહ્વાન કર્યું છે. ઇસ્લામિક સ્ટેટ ઓફ ઇરાક એન્ડ સિરિયા

diff --git a/LayoutTests/platform/ios-sim/fast/text/indic-expected.txt b/LayoutTests/platform/ios-sim/fast/text/indic-expected.txt
new file mode 100644 (file)
index 0000000..e2cfb31
--- /dev/null
+++ b/LayoutTests/platform/ios-sim/fast/text/indic-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderText {#text} at (0,0) size 636x19
+        text run at (0,0) width 636: "This page renders some indic text and makes sure that the text metrics match the expected metrics. "
+      RenderBR {BR} at (635,15) size 1x0
+      RenderText {#text} at (0,20) size 780x41
+        text run at (0,20) width 780: "\x{AA0}\x{AB3}\x{AA8}\x{ABE} \x{A87}\x{AB0}\x{ABE}\x{A95}\x{AC0} \x{AAA}\x{ACD}\x{AB0}\x{AA6}\x{AC7}\x{AB6}\x{ACB}\x{AA8}\x{AC7} \x{A87}\x{AB8}\x{ACD}\x{AB2}\x{ABE}\x{AAE}\x{ABF}\x{A95} \x{AB0}\x{ABE}\x{AB7}\x{ACD}\x{A9F}\x{ACD}\x{AB0} \x{A9C}\x{ABE}\x{AB9}\x{AC7}\x{AB0} \x{A95}\x{AB0}\x{ACD}\x{AAF}\x{AC1}\x{A82} \x{A9B}\x{AC7} \x{A85}\x{AA8}\x{AC7} \x{AAA}\x{ACB}\x{AA4}\x{ABE}\x{AA8}\x{ACB} \x{AB5}\x{ACD}\x{AAF}\x{ABE}\x{AAA} \x{AB5}\x{AA7}\x{ABE}\x{AB0}\x{AB5}\x{ABE} \x{AA4}\x{AC7}\x{AAE}\x{AA8}\x{ABE} \x{AB5}\x{AA1}\x{ABE} \x{AAA}\x{ACD}\x{AB0}\x{AA4}\x{ACD}\x{AAF}\x{AC7} \x{AB5}\x{AAB}\x{ABE}\x{AA6}\x{ABE}\x{AB0}\x{AC0}\x{AA8}\x{AC1}\x{A82} \x{AB5}\x{ABF}\x{AB6}\x{ACD}\x{AB5}\x{AAD}\x{AB0}\x{AA8}\x{ABE} \x{AAE}\x{AC1}\x{AB8}\x{ACD}\x{AB2}\x{ABF}\x{AAE}\x{ACB}\x{AA8}\x{AC7} \x{A86}\x{AB9}\x{ACD}\x{AB5}\x{ABE}\x{AA8} \x{A95}\x{AB0}\x{ACD}\x{AAF}\x{AC1}\x{A82} \x{A9B}\x{AC7}. \x{A87}\x{AB8}\x{ACD}\x{AB2}\x{ABE}\x{AAE}\x{ABF}\x{A95} \x{AB8}\x{ACD}\x{A9F}\x{AC7}\x{A9F}"
+        text run at (0,42) width 117: "\x{A93}\x{AAB} \x{A87}\x{AB0}\x{ABE}\x{A95} \x{A8F}\x{AA8}\x{ACD}\x{AA1} \x{AB8}\x{ABF}\x{AB0}\x{ABF}\x{AAF}\x{ABE}"

diff --git a/LayoutTests/platform/mac/fast/text/indic-expected.png b/LayoutTests/platform/mac/fast/text/indic-expected.png
new file mode 100644 (file)
index 0000000..9ac7595
Binary files /dev/null and b/LayoutTests/platform/mac/fast/text/indic-expected.png differ

diff --git a/LayoutTests/platform/mac/fast/text/indic-expected.txt b/LayoutTests/platform/mac/fast/text/indic-expected.txt
new file mode 100644 (file)
index 0000000..d524a2d
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/text/indic-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderText {#text} at (0,0) size 620x18
+        text run at (0,0) width 620: "This page renders some indic text and makes sure that the text metrics match the expected metrics. "
+      RenderBR {BR} at (620,14) size 0x0
+      RenderText {#text} at (0,19) size 743x43
+        text run at (0,19) width 743: "\x{AA0}\x{AB3}\x{AA8}\x{ABE} \x{A87}\x{AB0}\x{ABE}\x{A95}\x{AC0} \x{AAA}\x{ACD}\x{AB0}\x{AA6}\x{AC7}\x{AB6}\x{ACB}\x{AA8}\x{AC7} \x{A87}\x{AB8}\x{ACD}\x{AB2}\x{ABE}\x{AAE}\x{ABF}\x{A95} \x{AB0}\x{ABE}\x{AB7}\x{ACD}\x{A9F}\x{ACD}\x{AB0} \x{A9C}\x{ABE}\x{AB9}\x{AC7}\x{AB0} \x{A95}\x{AB0}\x{ACD}\x{AAF}\x{AC1}\x{A82} \x{A9B}\x{AC7} \x{A85}\x{AA8}\x{AC7} \x{AAA}\x{ACB}\x{AA4}\x{ABE}\x{AA8}\x{ACB} \x{AB5}\x{ACD}\x{AAF}\x{ABE}\x{AAA} \x{AB5}\x{AA7}\x{ABE}\x{AB0}\x{AB5}\x{ABE} \x{AA4}\x{AC7}\x{AAE}\x{AA8}\x{ABE} \x{AB5}\x{AA1}\x{ABE} \x{AAA}\x{ACD}\x{AB0}\x{AA4}\x{ACD}\x{AAF}\x{AC7} \x{AB5}\x{AAB}\x{ABE}\x{AA6}\x{ABE}\x{AB0}\x{AC0}\x{AA8}\x{AC1}\x{A82} \x{AB5}\x{ABF}\x{AB6}\x{ACD}\x{AB5}\x{AAD}\x{AB0}\x{AA8}\x{ABE} \x{AAE}\x{AC1}\x{AB8}\x{ACD}\x{AB2}\x{ABF}\x{AAE}\x{ACB}\x{AA8}\x{AC7} \x{A86}\x{AB9}\x{ACD}\x{AB5}\x{ABE}\x{AA8} \x{A95}\x{AB0}\x{ACD}\x{AAF}\x{AC1}\x{A82} \x{A9B}\x{AC7}."
+        text run at (0,44) width 206: "\x{A87}\x{AB8}\x{ACD}\x{AB2}\x{ABE}\x{AAE}\x{ABF}\x{A95} \x{AB8}\x{ACD}\x{A9F}\x{AC7}\x{A9F} \x{A93}\x{AAB} \x{A87}\x{AB0}\x{ABE}\x{A95} \x{A8F}\x{AA8}\x{ACD}\x{AA1} \x{AB8}\x{ABF}\x{AB0}\x{ABF}\x{AAF}\x{ABE}"

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 090231609045fbdc8330fe330d303f1411d6d037..9216c65a8653edbcfbcf8ce5593f5b5e5b445f81 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2014-06-30  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        All Indic text is rendered as boxes on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=134464
+
+        Reviewed by Simon Fraser.
+
+        I made a typo in r170207.
+
+        Test: fast/text/indic.html
+
+        * platform/graphics/ios/FontCacheIOS.mm:
+        (WebCore::languageSpecificFallbackFont):
+
 2014-06-30  Myles C. Maxfield  <mmaxfield@apple.com>
 
         [iOS] languageSpecificFallbackFont() is not consistent

diff --git a/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm b/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
index 44d9d369638a7d1627c281474d96d0fe372fa839..4fb845b8be724614133536c3919c334e10c862e5 100644 (file)
--- a/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
+++ b/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm
@@ -140,7 +140,7 @@ static LanguageSpecificFont languageSpecificFallbackFont(UChar32 c)
     if (c < 0x900)
         return LanguageSpecificFont::None;
     if (c < 0xE00)
-        return LanguageSpecificFont::Arabic;
+        return LanguageSpecificFont::Indic;
     if (c < 0xE80)
         return LanguageSpecificFont::Thai;
     if (c < 0x0F00)