Changeset 271425 in webkit

Timestamp:

Jan 12, 2021, 4:55:07 PM (6 years ago)

Author:

mmaxfield@apple.com

Message:

Multi-codepoint CJK grapheme clusters are not oriented correctly in vertical writing mode
​https://bugs.webkit.org/show_bug.cgi?id=220536
<rdar://problem/70633887>

Reviewed by Zalan Bujtas.

Source/WebCore:

We have two codeblocks in this section that are meant to be used
for non-CJK text, but the compound "if" statement was causing us to hit
one of them even for CJK text.

Test: fast/text/cjk-multi-codepoint-cluster-vertical.html

• platform/graphics/coretext/FontCascadeCoreText.cpp:

(WebCore::FontCascade::fontForCombiningCharacterSequence const):

LayoutTests:

• fast/text/cjk-multi-codepoint-cluster-vertical-expected.html: Added.
• fast/text/cjk-multi-codepoint-cluster-vertical.html: Added.
• platform/win/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/cjk-multi-codepoint-cluster-vertical-expected.html (added)
• LayoutTests/fast/text/cjk-multi-codepoint-cluster-vertical.html (added)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/coretext/FontCascadeCoreText.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-12  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Multi-codepoint CJK grapheme clusters are not oriented correctly in vertical writing mode
+        https://bugs.webkit.org/show_bug.cgi?id=220536
+        <rdar://problem/70633887>
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/text/cjk-multi-codepoint-cluster-vertical-expected.html: Added.
+        * fast/text/cjk-multi-codepoint-cluster-vertical.html: Added.
+        * platform/win/TestExpectations:
+
 2021-01-12  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/LayoutTests/platform/win/TestExpectations

@@ -4614 +4614 @@
 js/dom/webassembly-memory-shared-fail.html [ Skip ]
 storage/indexeddb/shared-memory-structured-clone.html [ Skip ]
+
+webkit.org/b/220536 fast/text/cjk-multi-codepoint-cluster-vertical.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-12  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Multi-codepoint CJK grapheme clusters are not oriented correctly in vertical writing mode
+        https://bugs.webkit.org/show_bug.cgi?id=220536
+        <rdar://problem/70633887>
+
+        Reviewed by Zalan Bujtas.
+
+        We have two codeblocks in this section that are meant to be used
+        for non-CJK text, but the compound "if" statement was causing us to hit
+        one of them even for CJK text.
+
+        Test: fast/text/cjk-multi-codepoint-cluster-vertical.html
+
+        * platform/graphics/coretext/FontCascadeCoreText.cpp:
+        (WebCore::FontCascade::fontForCombiningCharacterSequence const):
+
 2021-01-12  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/platform/graphics/coretext/FontCascadeCoreText.cpp

@@ -323 +323 @@
 #endif
         if (font->platformData().orientation() == FontOrientation::Vertical) {
-            if (isCJKIdeographOrSymbol(baseCharacter) && !font->hasVerticalGlyphs())
-                font = &font->brokenIdeographFont();
-            else if (m_fontDescription.nonCJKGlyphOrientation() == NonCJKGlyphOrientation::Mixed) {
+            if (isCJKIdeographOrSymbol(baseCharacter)) {
+                if (!font->hasVerticalGlyphs())
+                    font = &font->brokenIdeographFont();
+            } else if (m_fontDescription.nonCJKGlyphOrientation() == NonCJKGlyphOrientation::Mixed) {
                 const Font& verticalRightFont = font->verticalRightOrientationFont();
                 Glyph verticalRightGlyph = verticalRightFont.glyphForCharacter(baseCharacter);