[webkit-changes] [130570] trunk

Fri, 05 Oct 2012 17:37:08 -0700

Title: [130570] trunk
Revision
130570
Author
[email protected]
Date
2012-10-05 17:38:16 -0700 (Fri, 05 Oct 2012)

Log Message

OpenTypeVerticalData issue with DroidSansFallback.ttf on chromium-android and chromium-linux
https://bugs.webkit.org/show_bug.cgi?id=97824

Reviewed by Tony Chang.

Source/WebCore:

The issue occurred when a font that contains vert GSUB table but doesn't have
a DFLT script and the first script doesn't have vert feature. Added logic to
handle the case.

Test: fast/writing-mode/vertical-subst-font-vert-no-dflt.html

* platform/graphics/opentype/OpenTypeVerticalData.cpp:
(FeatureList):
(WebCore::OpenType::FeatureList::findFeature): Added to find the matching feature in FeatureList.
(WebCore::OpenType::GSUBTable::feature): Added logic to handle the case of no DFLT script and no vert feature under the first script.

LayoutTests:

Ref test for the change. The punctuations in the vertical text are expected to
be substituted with the corresponding vertical forms.

* fast/writing-mode/vertical-subst-font-vert-no-dflt-expected.html: Added.
* fast/writing-mode/vertical-subst-font-vert-no-dflt.html: Added.
* platform/mac/TestExpectations: Added the new test as it fails on Mac because of https://bugs.webkit.org/show_bug.cgi?id=98560.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (130569 => 130570)


--- trunk/LayoutTests/ChangeLog	2012-10-05 23:57:14 UTC (rev 130569)
+++ trunk/LayoutTests/ChangeLog	2012-10-06 00:38:16 UTC (rev 130570)
@@ -1,3 +1,17 @@
+2012-10-05  Xianzhu Wang  <[email protected]>
+
+        OpenTypeVerticalData issue with DroidSansFallback.ttf on chromium-android and chromium-linux
+        https://bugs.webkit.org/show_bug.cgi?id=97824
+
+        Reviewed by Tony Chang.
+
+        Ref test for the change. The punctuations in the vertical text are expected to
+        be substituted with the corresponding vertical forms.
+
+        * fast/writing-mode/vertical-subst-font-vert-no-dflt-expected.html: Added.
+        * fast/writing-mode/vertical-subst-font-vert-no-dflt.html: Added.
+        * platform/mac/TestExpectations: Added the new test as it fails on Mac because of https://bugs.webkit.org/show_bug.cgi?id=98560. 
+
 2012-10-05  Tony Chang  <[email protected]>
 
         Form controls should always be horizontal

Modified: trunk/LayoutTests/fast/writing-mode/resources/DroidSansFallback-reduced.ttf (130569 => 130570)


--- trunk/LayoutTests/fast/writing-mode/resources/DroidSansFallback-reduced.ttf	2012-10-05 23:57:14 UTC (rev 130569)
+++ trunk/LayoutTests/fast/writing-mode/resources/DroidSansFallback-reduced.ttf	2012-10-06 00:38:16 UTC (rev 130570)
@@ -1,7 +1,7 @@
-\x80DSIGܼFFTMYb*\xE7\xACGDEF
-\xCC#\xDC\xC4(GPOS\xA8\xF5\xAF\xC2ݰ	\xFCGSUB\xDD\xF0\xDC\xEC\xC4OS/2]\xF7Q`PfEd\xCF9\xA9:\xE7\xC8\xE4cmapT=u|8\xDCcvt T\xFCfpgm\xB0!Y\xB0T\xE0gaspܰglyf\xE2K\x8Bx\xAC(head\xFBdN<\x8C6hhea
+\x80DSIGܼFFTMYe\xEAo\xE7\xACGDEF
+\xCC#\xDC\xC4(GPOS\xA8\xF5\xAF\xC2ݰ	\xFCGSUB\xD7\xF7\xEA\xEA\xDC\xEC\xC4OS/2]\xF7Q`PfEd\xCF9\xA9:\xE7\xC8\xE4cmapT=u|8\xDCcvt T\xFCfpgm\xB0!Y\xB0T\xE0gaspܰglyf\xE2K\x8Bx\xAC(head\xFBk\xCE\xF8\x8C6hhea
 \xF6\xC4$hmtx\xE8\x84\x8Eh6tkern\xA7ɫ\xC07\xA0RlocaZY\xC4U6xmaxp
-\xF2Y\xE8 name \x94}pH\xF4\xDApostH9\xD1QP\xD0\x8B\xDDprep\x80\x88)T\xE8prop\x82I\x87\xFC\xE8\xAC\xEAvhea\x83D\xEB\x98$vmtx\xE4\xF2\xDC\xEB\xBCB\x8A=r\xB8^_<\xF5+̑B\x9D̑B\x9D\xFF\xCB\xFF\xBC8\xFF\xBCM\xFF\xCB\xFFO8
+\xF2Y\xE8 name \x94}pH\xF4\xDApostH9\xD1QP\xD0\x8B\xDDprep\x80\x88)T\xE8prop\x82I\x87\xFC\xE8\xAC\xEAvhea\x83D\xEB\x98$vmtx\xE4\xF2\xDC\xEB\xBCB\x8A=|=@n_<\xF5+̕\xFB̕\xFB\xFF\xCB\xFF\xBC8\xFF\xBCM\xFF\xCB\xFFO8
 \x9D
 \x9DT'\xABW\xDC\x90\xB3\xA6$\xB3\xA6z
 >\x91\xFF+\xDF\xFC\xFB1ASC@\xFF\xFF\xC4\xFF\xC3D ?\xFF\xD7\xFF\x89\xB7 UCEg\xA5\x8D\xD3
@@ -11037,7 +11037,7 @@
 glyph50980
 glyph50981\xFF\xFF 
 \x9C
-P^cyrlgrek$hani.latn:\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFFvert.	\xE5	\xE6	\xE4	\xE8	\xE7	\xEA	\xE9	\xF2	\xF3	\xF4	\xF5	\xF6	\xF7	\xF2	\xF3	\xE4	\xF6	\xF7	\xF4	\xF5+,
+P^cyrlgrek$hani.latn:\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFFvert.	\xE5	\xE6	\xF6	\xF7	\xE4	\xE8	\xE7	\xEA	\xE9	\xF2	\xF3	\xF4	\xF5	\xF6	\xF7	\xF2	\xF3	\xE4	\xF4	\xF5+,=>
 
 
 
@@ -11052,8 +11052,6 @@
 +
 ,
 /
-^
-`
 ~
 \x80
 R`cyrlgrek&hani2latn<\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFFkern\xE2U\xB4\xB4"((R\x90\xA2\xD4@j\x94\xD2"PV*\xD0v\xD4\x8A"\xB4\xB4\xBA\xB4\xCC\xEA\xB4\xB4"DVl\x82\x98\xC2\xD8"\xF2\xD2\xB4\xB4\xF8\xF8\xF8\x94\x94*\xC2D\xB4"\xC2l8\xC2NDDDDD\xF8xx$\xFF\xF6,7
@@ -11144,7 +11142,7 @@
 :
 ;<
 =F\xFF\xF8G\xFF\xF8H\xFF\xF8J\xFF\xFBR\xFF\xF8T\xFF\xF8WYZ{\xFF\xEB\x83\xFF\xF8\x84\xFF\xF8\x85\xFF\xF8\x86\xFF\xF8\x8A\xFF\xF8\x8B\xFF\xF8\x8D\xFF\xF8\xA6\xFF\xF8U
-$%&'),./2345789:;<=>DEFHIJKNPQRUVWYZ[\]^|~\x81\x82\x83\x84\x85\x86\x8A\x8B\x8D\x8E\x8F\x90\x9F\xA6go\x81\x83\x85\x86\x87\x89\x8F\x91\x92\x93\x95\xB8\xBC\xBD\xC0\xD1\xD2\xD5\xD6)+ɉo1\xC3Gxg̑BxGSUBGPOS\x848'vert' Vertical Alternates (obs) lookup 0'vert' Vertical Alternates (obs) lookup 0 subtable1'kern' Horizontal Kerning lookup 0'kern' Horizontal Kerning lookup 0 subtablex\x80P
+$%&'),./2345789:;<=>DEFHIJKNPQRUVWYZ[\]^|~\x81\x82\x83\x84\x85\x86\x8A\x8B\x8D\x8E\x8F\x90\x9F\xA6go\x81\x83\x85\x86\x87\x89\x8F\x91\x92\x93\x95\xB8\xBC\xBD\xC0\xD1\xD2\xD5\xD6)+ɉo1\xC3Gxg̕\xD6GSUBGPOS\x848'vert' Vertical Alternates (obs) lookup 0'vert' Vertical Alternates (obs) lookup 0 subtable1'kern' Horizontal Kerning lookup 0'kern' Horizontal Kerning lookup 0 subtablex\x80P
 
 	

Added: trunk/LayoutTests/fast/writing-mode/vertical-subst-font-vert-no-dflt-expected.html (0 => 130570)


--- trunk/LayoutTests/fast/writing-mode/vertical-subst-font-vert-no-dflt-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/writing-mode/vertical-subst-font-vert-no-dflt-expected.html	2012-10-06 00:38:16 UTC (rev 130570)
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<!--
+The difference between the test file and this expectation file is that
+the punctuations are replaced by the characters that they should be
+substituted according to the vert GSUB table.
+-->
+<html>
+<head>
+<title>Vertical punctuations using font with GSUB/vert table not under dflt script</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style type="text/css">
+@font-face {
+    font-family: 'droid';
+    /* DroidSansFallback-reduced.ttf was generated based on Android's
+       DroidSansFallback.ttf by removing many glyphs to meet the size
+       requirement of web font face.
+       It contains GSUB and vert table but not under dflt script.
+    */
+    src: url('resources/DroidSansFallback-reduced.ttf');
+}
+#test {
+    font-size: 25px;
+    font-family: droid;
+    -webkit-writing-mode: vertical-rl;
+    height: 500px;
+}
+</style>
+</head>
+<body>
+Puctuations should be properly rotated and positioned.
+<div id="test">
+<!-- Punctuations are using the vertical substitution characters. -->
+&#xfe35;&#x4e00;&#xfe36;
+&#xfe39;&#x4e01;&#xfe3a;
+&#xfe37;&#x4e02;&#xfe38;
+</div>
+</body>

Added: trunk/LayoutTests/fast/writing-mode/vertical-subst-font-vert-no-dflt.html (0 => 130570)


--- trunk/LayoutTests/fast/writing-mode/vertical-subst-font-vert-no-dflt.html	                        (rev 0)
+++ trunk/LayoutTests/fast/writing-mode/vertical-subst-font-vert-no-dflt.html	2012-10-06 00:38:16 UTC (rev 130570)
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<title>Vertical punctuations using font with GSUB/vert table not under dflt script</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<style type="text/css">
+@font-face {
+    font-family: 'droid';
+    /* DroidSansFallback-reduced.ttf was generated based on Android's
+       DroidSansFallback.ttf by removing many glyphs to meet the size
+       requirement of web font face.
+       It contains GSUB and vert table but not under dflt script.
+    */
+    src: url('resources/DroidSansFallback-reduced.ttf');
+}
+#test {
+    font-size: 25px;
+    font-family: droid;
+    -webkit-writing-mode: vertical-rl;
+    height: 500px;
+}
+</style>
+</head>
+<body>
+Puctuations should be properly rotated and positioned.
+<div id="test">
+&#xff08;&#x4e00;&#xff09;
+&#x3014;&#x4e01;&#x3015;
+&#xff5b;&#x4e02;&#xff5d;
+</div>
+</body>

Modified: trunk/LayoutTests/platform/mac/TestExpectations (130569 => 130570)


--- trunk/LayoutTests/platform/mac/TestExpectations	2012-10-05 23:57:14 UTC (rev 130569)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2012-10-06 00:38:16 UTC (rev 130570)
@@ -1311,3 +1311,6 @@
 
 # Requires TestRunner displayInvalidatedRegion() support.
 webkit.org/b/98523 fast/images/repaint-subrect-grid.html [ Failure ]
+
+# Rendering/Layout issue of CJK vertical text with some font.
+webkit.org/b/98560 fast/writing-mode/vertical-subst-font-vert-no-dflt.html [ ImageOnlyFailure ]

Modified: trunk/Source/WebCore/ChangeLog (130569 => 130570)


--- trunk/Source/WebCore/ChangeLog	2012-10-05 23:57:14 UTC (rev 130569)
+++ trunk/Source/WebCore/ChangeLog	2012-10-06 00:38:16 UTC (rev 130570)
@@ -1,3 +1,21 @@
+2012-10-05  Xianzhu Wang  <[email protected]>
+
+        OpenTypeVerticalData issue with DroidSansFallback.ttf on chromium-android and chromium-linux
+        https://bugs.webkit.org/show_bug.cgi?id=97824
+
+        Reviewed by Tony Chang.
+
+        The issue occurred when a font that contains vert GSUB table but doesn't have
+        a DFLT script and the first script doesn't have vert feature. Added logic to
+        handle the case.
+
+        Test: fast/writing-mode/vertical-subst-font-vert-no-dflt.html
+
+        * platform/graphics/opentype/OpenTypeVerticalData.cpp:
+        (FeatureList):
+        (WebCore::OpenType::FeatureList::findFeature): Added to find the matching feature in FeatureList.
+        (WebCore::OpenType::GSUBTable::feature): Added logic to handle the case of no DFLT script and no vert feature under the first script.
+
 2012-10-05  Tony Chang  <[email protected]>
 
         Form controls should always be horizontal

Modified: trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp (130569 => 130570)


--- trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp	2012-10-05 23:57:14 UTC (rev 130569)
+++ trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp	2012-10-06 00:38:16 UTC (rev 130570)
@@ -256,6 +256,15 @@
             return validateOffset<FeatureTable>(buffer, features[index].featureOffset);
         return 0;
     }
+
+    const FeatureTable* findFeature(OpenType::Tag tag, const SharedBuffer& buffer) const
+    {
+        for (uint16_t i = 0; i < featureCount; ++i) {
+            if (isValidEnd(buffer, &features[i]) && features[i].featureTag == tag)
+                return validateOffset<FeatureTable>(buffer, features[i].featureOffset);
+        }
+        return 0;
+    }
 };
 
 struct LangSysTable : TableBase {
@@ -361,9 +370,17 @@
     {
         const LangSysTable* langSys = defaultLangSys(buffer);
         const FeatureList* features = featureList(buffer);
-        if (!langSys || !features)
+        if (!features)
             return 0;
-        return langSys->feature(featureTag, features, buffer);
+        const FeatureTable* feature = 0;
+        if (langSys)
+            feature = langSys->feature(featureTag, features, buffer);
+        if (!feature) {
+            // If the font has no langSys table, or has no default script and the first script doesn't
+            // have the requested feature, then use the first matching feature directly.
+            feature = features->findFeature(featureTag, buffer);
+        }
+        return feature;
     }
 
     bool getVerticalGlyphSubstitutions(HashMap<Glyph, Glyph>* map, const SharedBuffer& buffer) const

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to