[IFC] inline-block child preceded by an inline child has incorrect po…

…sitioning in vertical writing modes with a right-to-left direction

https://bugs.webkit.org/show_bug.cgi?id=264425
<rdar://problem/118128181>

Reviewed by Antti Koivisto.

Turn (half)logical left to visual on BoxGeometry too.

* LayoutTests/fast/text/rtl-vertical-text-misalign-with-inline-blocks-expected.html: Added.
* LayoutTests/fast/text/rtl-vertical-text-misalign-with-inline-blocks.html: Added.
* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
(WebCore::Layout::InlineDisplayContentBuilder::adjustVisualGeometryForDisplayBox):
(WebCore::Layout::InlineDisplayContentBuilder::setLeftForWritingMode const):
* Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.h:

Canonical link: https://commits.webkit.org/270442@main

LayoutTests/fast/text/rtl-vertical-text-misalign-with-inline-blocks-expected.html

@@ -0,0 +1,7 @@
+<style>
+.container {
+  writing-mode: vertical-rl;
+  font-family: Ahem;
+}
+</style>
+<div class=container>this shouldall be on the same line</div>

LayoutTests/fast/text/rtl-vertical-text-misalign-with-inline-blocks.html

@@ -0,0 +1,11 @@
+<style>
+.container {
+  writing-mode: vertical-rl;
+  direction: rtl;
+  font-family: Ahem;
+}
+.content {
+  display: inline-block;
+}
+</style>
+<div class=container><div class=content>all be on the same line</div><span></span><div class=content>this should</div></div>

Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp

@@ -677,8 +677,8 @@ void InlineDisplayContentBuilder::adjustVisualGeometryForDisplayBox(size_t displ
             auto& boxGeometry = formattingContext().geometryForBox(layoutBox);
             auto boxMarginLeft = marginLeftInInlineDirection(boxGeometry, isLeftToRightDirection);
 
-            auto borderBoxLeft = LayoutUnit { contentRightInInlineDirectionVisualOrder + boxMarginLeft };
-            boxGeometry.setLeft(borderBoxLeft);
+            auto borderBoxLeft = InlineLayoutUnit { contentRightInInlineDirectionVisualOrder + boxMarginLeft };
+            setLeftForWritingMode(boxGeometry, LayoutUnit { borderBoxLeft }, writingMode);
             setLeftForWritingMode(displayBox, borderBoxLeft, writingMode);
 
             contentRightInInlineDirectionVisualOrder += boxGeometry.marginBoxWidth();
@@ -1178,16 +1178,17 @@ InlineRect InlineDisplayContentBuilder::flipRootInlineBoxRectToVisualForWritingM
     return rootInlineBoxLogicalRect;
 }
 
-void InlineDisplayContentBuilder::setLeftForWritingMode(InlineDisplay::Box& displayBox, InlineLayoutUnit logicalLeft, WritingMode writingMode) const
+template <typename BoxType, typename LayoutUnitType>
+void InlineDisplayContentBuilder::setLeftForWritingMode(BoxType& box, LayoutUnitType logicalLeft, WritingMode writingMode) const
 {
     switch (writingModeToBlockFlowDirection(writingMode)) {
     case BlockFlowDirection::TopToBottom:
     case BlockFlowDirection::BottomToTop:
-        displayBox.setLeft(logicalLeft);
+        box.setLeft(logicalLeft);
         break;
     case BlockFlowDirection::LeftToRight:
     case BlockFlowDirection::RightToLeft:
-        displayBox.setTop(logicalLeft);
+        box.setTop(logicalLeft);
         break;
     default:
         ASSERT_NOT_REACHED();

Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.h

@@ -71,7 +71,8 @@ class InlineDisplayContentBuilder {
 
     InlineRect flipLogicalRectToVisualForWritingModeWithinLine(const InlineRect& logicalRect, const InlineRect& lineLogicalRect, WritingMode) const;
     InlineRect flipRootInlineBoxRectToVisualForWritingMode(const InlineRect& rootInlineBoxLogicalRect, WritingMode) const;
-    void setLeftForWritingMode(InlineDisplay::Box&, InlineLayoutUnit logicalRight, WritingMode) const;
+    template <typename BoxType, typename LayoutUnitType>
+    void setLeftForWritingMode(BoxType&, LayoutUnitType logicalLeft, WritingMode) const;
     void setRightForWritingMode(InlineDisplay::Box&, InlineLayoutUnit logicalRight, WritingMode) const;
     InlineLayoutPoint movePointHorizontallyForWritingMode(const InlineLayoutPoint& topLeft, InlineLayoutUnit horizontalOffset, WritingMode) const;
     InlineLayoutUnit outsideListMarkerVisualPosition(const ElementBox&) const;