Changeset 285780 in webkit

Timestamp:

Nov 13, 2021, 1:59:47 PM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Inline box end (opaque to bidi) should get the bidi level from its adjacent content
​https://bugs.webkit.org/show_bug.cgi?id=233082

Reviewed by Antti Koivisto.

While the inline box start item (<span>) gets the bidi level from the next (adjacent) content, inline box end (</span>)
should get it from the previous content (these are opaque inline items).

e.g <span>bidi content</span>
both the inline box start and the inline box end items get their bidi level from the "bidi content" inline text item.

• layout/formattingContexts/inline/InlineItemsBuilder.cpp:

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-13  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Inline box end (opaque to bidi) should get the bidi level from its adjacent content
+        https://bugs.webkit.org/show_bug.cgi?id=233082
+
+        Reviewed by Antti Koivisto.
+
+        While the inline box start item (<span>) gets the bidi level from the next (adjacent) content, inline box end (</span>)
+        should get it from the previous content (these are opaque inline items).
+
+          e.g <span>bidi content</span>  
+          both the inline box start and the inline box end items get their bidi level from the "bidi content" inline text item.
+
+        * layout/formattingContexts/inline/InlineItemsBuilder.cpp:
+        (WebCore::Layout::InlineItemsBuilder::breakAndComputeBidiLevels):
+
 2021-11-12  Timothy Hatcher  <timothy@apple.com>
 

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

@@ -325 +325 @@
         auto lastBidiLevel = rootBidiLevel;
         for (auto index = inlineItems.size(); index--;) {
-            if (!inlineItemOffsets[index])
+            if (inlineItemOffsets[index]) {
+                lastBidiLevel = inlineItems[index].bidiLevel();
+                continue;
+            }
+            if (inlineItems[index].isInlineBoxStart()) {
+                // Inline box start (e.g <span>) uses its content bidi level (next inline item).
                 inlineItems[index].setBidiLevel(lastBidiLevel);
-            else
-                lastBidiLevel = inlineItems[index].bidiLevel();
+                continue;
+            }
+            if (inlineItems[index].isInlineBoxEnd()) {
+                // Inline box end (e.g. </span>) also uses the content bidi level, but in this case it's the previous content.
+                auto previousBidiLevel = [&]() -> std::optional<UBiDiLevel> {
+                    for (auto i = index; i--;) {
+                        if (inlineItemOffsets[i])
+                            return inlineItems[i].bidiLevel();
+                    }
+                    return { };
+                }();
+                inlineItems[index].setBidiLevel(previousBidiLevel.value_or(rootBidiLevel));
+                continue;
+            }
+            ASSERT_NOT_REACHED();
         }
     };