Changeset 286951 in webkit

Timestamp:

Dec 13, 2021, 9:04:02 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Non-bidi content with RTL inline base direction may need visual reordering
​https://bugs.webkit.org/show_bug.cgi?id=234242

Reviewed by Antti Koivisto.

This is in preparation for enabling content with RTL base direction.

• layout/formattingContexts/inline/InlineItemsBuilder.cpp:

(WebCore::Layout::InlineItemsBuilder::build):
(WebCore::Layout::InlineItemsBuilder::breakAndComputeBidiLevels):

• layout/formattingContexts/inline/InlineItemsBuilder.h:

(WebCore::Layout::InlineItemsBuilder::needsVisualReordeering const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/inline/InlineItemsBuilder.cpp (modified) (2 diffs)
• layout/formattingContexts/inline/InlineItemsBuilder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-13  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Non-bidi content with RTL inline base direction may need visual reordering
+        https://bugs.webkit.org/show_bug.cgi?id=234242
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for enabling content with RTL base direction.
+
+        * layout/formattingContexts/inline/InlineItemsBuilder.cpp:
+        (WebCore::Layout::InlineItemsBuilder::build):
+        (WebCore::Layout::InlineItemsBuilder::breakAndComputeBidiLevels):
+        * layout/formattingContexts/inline/InlineItemsBuilder.h:
+        (WebCore::Layout::InlineItemsBuilder::needsVisualReordeering const):
+
 2021-12-13  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp

@@ -87 +87 @@
     InlineItems inlineItems;
     collectInlineItems(inlineItems);
-    if (hasSeenBidiContent())
+    if (needsVisualReordeering())
         breakAndComputeBidiLevels(inlineItems);
     computeInlineTextItemWidths(inlineItems);
@@ -251 +251 @@
 void InlineItemsBuilder::breakAndComputeBidiLevels(InlineItems& inlineItems)
 {
-    ASSERT(hasSeenBidiContent());
+    ASSERT(needsVisualReordeering());
     ASSERT(!inlineItems.isEmpty());
 

trunk/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.h

@@ -51 +51 @@
     void handleInlineLevelBox(const Box&, InlineItems&);
     
+    bool needsVisualReordeering() const { return hasSeenBidiContent() || !root().style().isLeftToRightDirection(); }
     bool hasSeenBidiContent() const { return m_hasSeenBidiContent; }