Changeset 285171 in webkit

Timestamp:

Nov 2, 2021, 12:02:46 PM (5 years ago)

Author:

Antti Koivisto

Message:

[LFC][Integration] Provide bidi properties when constructing TextRun
​https://bugs.webkit.org/show_bug.cgi?id=232632

Reviewed by Alan Bujtas.

Enable correct painting of bidi text runs.

• layout/integration/InlineIteratorBoxModernPath.h:

(WebCore::InlineIterator::BoxModernPath::createTextRun const):
(WebCore::InlineIterator::BoxModernPath::renderText const):
(WebCore::InlineIterator::BoxModernPath::direction const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/InlineIteratorBoxModernPath.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-02  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] Provide bidi properties when constructing TextRun
+        https://bugs.webkit.org/show_bug.cgi?id=232632
+
+        Reviewed by Alan Bujtas.
+
+        Enable correct painting of bidi text runs.
+
+        * layout/integration/InlineIteratorBoxModernPath.h:
+        (WebCore::InlineIterator::BoxModernPath::createTextRun const):
+        (WebCore::InlineIterator::BoxModernPath::renderText const):
+        (WebCore::InlineIterator::BoxModernPath::direction const):
+
 2021-11-02  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebCore/layout/integration/InlineIteratorBoxModernPath.h

@@ -56 +56 @@
 
     bool isHorizontal() const { return true; }
+    // FIXME: Provide or remove.
     bool dirOverride() const { return false; }
     bool isLineBreak() const { return box().isLineBreak(); }
@@ -289 +290 @@
         }();
 
-        TextRun textRun { textForRun, xPos, expansion.horizontalExpansion, expansion.behavior };
+        bool directionalOverride = dirOverride() || style.rtlOrdering() == Order::Visual;
+        bool characterScanForCodePath = !renderText().canUseSimpleFontCodePath();
+        TextRun textRun { textForRun, xPos, expansion.horizontalExpansion, expansion.behavior, direction(), directionalOverride, characterScanForCodePath };
         textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
         return textRun;
     };
 
+    const RenderText& renderText() const { return downcast<RenderText>(renderer()); }
+    TextDirection direction() const { return bidiLevel() % 2 ? TextDirection::RTL : TextDirection::LTR; }
+
     RefPtr<const LayoutIntegration::InlineContent> m_inlineContent;
     size_t m_boxIndex { 0 };