Changeset 286968 in webkit

Timestamp:

Dec 13, 2021, 12:21:18 PM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Simple RTL content does not need visual reordering
​https://bugs.webkit.org/show_bug.cgi?id=234252

Reviewed by Antti Koivisto.

• layout/formattingContexts/inline/InlineItemsBuilder.cpp:

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

• layout/formattingContexts/inline/InlineItemsBuilder.h:

(WebCore::Layout::InlineItemsBuilder::needsVisualReordering const):
(WebCore::Layout::InlineItemsBuilder::needsVisualReordeering const): Deleted.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-13  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Simple RTL content does not need visual reordering
+        https://bugs.webkit.org/show_bug.cgi?id=234252
+
+        Reviewed by Antti Koivisto.
+
+        * layout/formattingContexts/inline/InlineItemsBuilder.cpp:
+        (WebCore::Layout::InlineItemsBuilder::build):
+        (WebCore::Layout::InlineItemsBuilder::breakAndComputeBidiLevels):
+        * layout/formattingContexts/inline/InlineItemsBuilder.h:
+        (WebCore::Layout::InlineItemsBuilder::needsVisualReordering const):
+        (WebCore::Layout::InlineItemsBuilder::needsVisualReordeering const): Deleted.
+
 2021-12-13  Youenn Fablet  <youenn@apple.com>
 

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

@@ -87 +87 @@
     InlineItems inlineItems;
     collectInlineItems(inlineItems);
-    if (needsVisualReordeering())
+    if (needsVisualReordering())
         breakAndComputeBidiLevels(inlineItems);
     computeInlineTextItemWidths(inlineItems);
@@ -251 +251 @@
 void InlineItemsBuilder::breakAndComputeBidiLevels(InlineItems& inlineItems)
 {
-    ASSERT(needsVisualReordeering());
+    ASSERT(needsVisualReordering());
     ASSERT(!inlineItems.isEmpty());
 
@@ -259 +259 @@
     buildBidiParagraph(root().style(), inlineItems, paragraphContentBuilder, inlineItemOffsets);
     ASSERT(inlineItemOffsets.size() == inlineItems.size());
+    if (paragraphContentBuilder.is8Bit()) {
+        // Simple content with RTL inline base direction could just follow the logical order.
+        // Note that inline level elements produce 16bit paragraph content by appending objectReplacementCharacter.
+        // e.g. <div dir=rtl>this initiates 8bit paragraph builder</div> while
+        //      <div dir=rtl><img> <- turns the paragraph builder to 16bit</div> 
+        return;
+    }
 
     // 1. Setup the bidi boundary loop by calling ubidi_setPara with the paragraph text.

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

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