[IFC] Inappropriate word order in the Arabic-English dictionary

https://bugs.webkit.org/show_bug.cgi?id=265332 <rdar://99087118> Reviewed by Antti Koivisto. Inline box start/end markers with non-default unicode-bidi values do not participate in bidi reordering (they don't inject control characters to initiate isolation/embedding). We also set their bidi levels to opaque to ensue ICU does not get confused while running reordering. However inline box start/end makers with injected control characters (e.g. <span style="unicode-bidi: isolate">isolated</span) should keep their ICU assigned bidi level values for reordering. * LayoutTests/fast/text/bidi-content-with-normal-inline-box-mispositioned-expected.html: Added. * LayoutTests/fast/text/bidi-content-with-normal-inline-box-mispositioned.html: Added. * Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp: (WebCore::Layout::buildBidiParagraph): Canonical link: https://commits.webkit.org/271112@main
WebKit · Nov 25, 2023 · 55edb4c · 55edb4c
1 parent 3e10929
commit 55edb4c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/LayoutTests/fast/text/bidi-content-with-normal-inline-box-mispositioned-expected.html b/LayoutTests/fast/text/bidi-content-with-normal-inline-box-mispositioned-expected.html
@@ -0,0 +1,2 @@
+<meta charset="utf-8">
+<div>ش<span style="unicode-bidi: isolate">pass if this content is visually _not_ leading</span><div>
diff --git a/LayoutTests/fast/text/bidi-content-with-normal-inline-box-mispositioned.html b/LayoutTests/fast/text/bidi-content-with-normal-inline-box-mispositioned.html
@@ -0,0 +1,2 @@
+<meta charset="utf-8">
+<div><span></span>ش<span style="unicode-bidi: isolate">pass if this content is visually _not_ leading</span><div>
diff --git a/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp b/Source/WebCore/layout/formattingContexts/inline/InlineItemsBuilder.cpp
@@ -601,15 +601,21 @@ void InlineItemsBuilder::breakAndComputeBidiLevels(InlineItemList& inlineItemLis
         inlineBoxContentFlagStack.reserveInitialCapacity(inlineItemList.size());
         for (auto index = inlineItemList.size(); index--;) {
             auto& inlineItem = inlineItemList[index];
+            auto& style = inlineItem.style();
+            auto initiatesControlCharacter = style.rtlOrdering() == Order::Logical && style.unicodeBidi() != UnicodeBidi::Normal;
+
             if (inlineItem.isInlineBoxStart()) {
                 ASSERT(!inlineBoxContentFlagStack.isEmpty());
-                if (inlineBoxContentFlagStack.takeLast() == InlineBoxHasContent::Yes)
-                    inlineItemList[index].setBidiLevel(InlineItem::opaqueBidiLevel);
+                if (inlineBoxContentFlagStack.takeLast() == InlineBoxHasContent::Yes) {
+                    if (!initiatesControlCharacter)
+                        inlineItemList[index].setBidiLevel(InlineItem::opaqueBidiLevel);
+                }
                 continue;
             }
             if (inlineItem.isInlineBoxEnd()) {
                 inlineBoxContentFlagStack.append(InlineBoxHasContent::No);
-                inlineItem.setBidiLevel(InlineItem::opaqueBidiLevel);
+                if (!initiatesControlCharacter)
+                    inlineItem.setBidiLevel(InlineItem::opaqueBidiLevel);
                 continue;
             }
             if (inlineItem.isWordBreakOpportunity()) {