Changeset 285716 in webkit

Timestamp:

Nov 12, 2021, 6:40:42 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Add inline box margin-start support for visual ordering (bidi)
​https://bugs.webkit.org/show_bug.cgi?id=233022

Reviewed by Antti Koivisto.

Line run geometry is margin box based (only applicable for inline level boxes), while
the displayRect() returns border box based geometry (again, only relevant for inline level boxes).
When computing the border box based left position using the distanceFromLogicalPreviousRun (line run based)
we have to offset it with the margin value.

• layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:

(WebCore::Layout::InlineDisplayContentBuilder::createBoxesAndUpdateGeometryForLineContent):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-12  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Add inline box margin-start support for visual ordering (bidi)
+        https://bugs.webkit.org/show_bug.cgi?id=233022
+
+        Reviewed by Antti Koivisto.
+
+        Line run geometry is margin box based (only applicable for inline level boxes), while
+        the displayRect() returns border box based geometry (again, only relevant for inline level boxes).
+        When computing the border box based left position using the distanceFromLogicalPreviousRun (line run based)
+        we have to offset it with the margin value.
+
+        * layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
+        (WebCore::Layout::InlineDisplayContentBuilder::createBoxesAndUpdateGeometryForLineContent):
+
 2021-11-12  Adrian Perez de Castro  <aperez@igalia.com>
 

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

@@ -96 +96 @@
         auto displayBoxRect = [&] {
             auto logicalRect = InlineRect { };
+            auto marginStart = std::optional<LayoutUnit> { };
 
             if (lineRun.isText() || lineRun.isSoftLineBreak())
@@ -103 +104 @@
             else {
                 auto& boxGeometry = formattingState.boxGeometry(layoutBox);
+                marginStart = boxGeometry.marginStart();
                 if (lineRun.isBox())
                     logicalRect = lineBox.logicalBorderBoxForAtomicInlineLevelBox(layoutBox, boxGeometry);
@@ -120 +122 @@
             auto distanceFromLogicalPreviousRun = logicalPreviousRun ? lineRun.logicalLeft() - logicalPreviousRun->logicalRight() : lineRun.logicalLeft();
             auto visualOrderRect = logicalRect;
-            auto contentLeft = contentRightInVisualOrder + distanceFromLogicalPreviousRun;
+            auto contentLeft = contentRightInVisualOrder + distanceFromLogicalPreviousRun + marginStart.value_or(0);
             visualOrderRect.setLeft(contentLeft);
             // The inline box right edge includes its content as well as the inline box end (padding-right etc).
             // What we need here is the inline box start run's width.
-            contentRightInVisualOrder = lineRun.isInlineBoxStart() || lineRun.isLineSpanningInlineBoxStart()
-                ? visualOrderRect.left() + lineRun.logicalWidth()
-                : visualOrderRect.right();
+            // Note that content width does not refer to content _box_ here (it does include padding and border for inline level boxes).
+            auto contentWidth = lineRun.isInlineBoxStart() || lineRun.isLineSpanningInlineBoxStart() ? lineRun.logicalWidth() - *marginStart : logicalRect.width();
+            contentRightInVisualOrder = visualOrderRect.left() + contentWidth;
             return visualOrderRect;
         };