Changeset 130570 in webkit

Timestamp:

Oct 5, 2012 5:38:16 PM (12 years ago)

Author:

wangxianzhu@chromium.org

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/writing-mode/resources/DroidSansFallback-reduced.ttf (modified) (previous)
• LayoutTests/fast/writing-mode/vertical-subst-font-vert-no-dflt-expected.html (added)
• LayoutTests/fast/writing-mode/vertical-subst-font-vert-no-dflt.html (added)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-10-05  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        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  <tony@chromium.org>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1312 +1312 @@
 # 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 ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-05  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        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  <tony@chromium.org>
 

trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp

@@ -257 +257 @@
         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;
+    }
 };
 
@@ -362 +371 @@
         const LangSysTable* langSys = defaultLangSys(buffer);
         const FeatureList* features = featureList(buffer);
-        if (!langSys || !features)
-            return 0;
-        return langSys->feature(featureTag, features, buffer);
+        if (!features)
+            return 0;
+        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;
     }