Changeset 267437 in webkit

Timestamp:

Sep 22, 2020, 2:45:32 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Atomic inline-level box with margin is mispositioned
​https://bugs.webkit.org/show_bug.cgi?id=216842

Reviewed by Antti Koivisto.

The inline box that an atomic inline-level box generates has the height of the margin box. Therefore the inline box's logical top position
is the position of the top edge of the margin box.
When converting the inline box geometry back to the layout box, we need to offset the top position (border box top edge)
with the value of the used margin before.

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContext.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Atomic inline-level box with margin is mispositioned
+        https://bugs.webkit.org/show_bug.cgi?id=216842
+
+        Reviewed by Antti Koivisto.
+
+        The inline box that an atomic inline-level box generates has the height of the margin box. Therefore the inline box's logical top position
+        is the position of the top edge of the margin box.
+        When converting the inline box geometry back to the layout box, we need to offset the top position (border box top edge)
+        with the value of the used margin before.
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):
+
 2020-09-22  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp

@@ -445 +445 @@
             }
             auto& boxGeometry = formattingState.boxGeometry(layoutBox);
-            auto logicalTopLeft = inlineBox->logicalRect().topLeft();
-
-            logicalTopLeft.move({ }, lineBoxVerticalOffset);
+            auto marginBoxLogicalTopLeft = inlineBox->logicalRect().topLeft();
+            auto borderBoxLogicalTopLeft = marginBoxLogicalTopLeft + InlineLayoutSize({ }, boxGeometry.marginBefore());
+
+            borderBoxLogicalTopLeft.move({ }, lineBoxVerticalOffset);
             if (layoutBox.isInFlowPositioned())
-                logicalTopLeft += geometry.inFlowPositionedPositionOffset(layoutBox, horizontalConstraints);
+                borderBoxLogicalTopLeft += geometry.inFlowPositionedPositionOffset(layoutBox, horizontalConstraints);
 
             if (layoutBox.isAtomicInlineLevelBox()) {
                 // Atomic inline boxes are all set. Their margin/border/content box geometries are already computed. We just have to position them here.
-                boxGeometry.setLogicalTopLeft(toLayoutPoint(logicalTopLeft));
+                boxGeometry.setLogicalTopLeft(toLayoutPoint(borderBoxLogicalTopLeft));
                 continue;
             }
@@ -463 +464 @@
             if (!isSpanningInlineBox) {
                 // This box showed up on this line the first time.
-                boxGeometry.setLogicalTopLeft(toLayoutPoint(logicalTopLeft));
+                boxGeometry.setLogicalTopLeft(toLayoutPoint(borderBoxLogicalTopLeft));
                 boxGeometry.setContentBoxWidth(toLayoutUnit(contentBoxWidth));
                 boxGeometry.setContentBoxHeight(toLayoutUnit(inlineBox->logicalHeight()));
@@ -469 +470 @@
             }
             // This is a just a simple box geometry for the line spanning inline box. getBoundingClientRect looks into each line boxes (will turn into fragmented boxes).
-            boxGeometry.setLogicalLeft(std::min(boxGeometry.logicalLeft(), toLayoutUnit(logicalTopLeft.x())));
+            boxGeometry.setLogicalLeft(std::min(boxGeometry.logicalLeft(), toLayoutUnit(borderBoxLogicalTopLeft.x())));
             boxGeometry.setContentBoxWidth(std::max(toLayoutUnit(contentBoxWidth), boxGeometry.contentBoxWidth()));
             boxGeometry.setContentBoxHeight(boxGeometry.contentBoxHeight() + toLayoutUnit(inlineBox->logicalHeight()));