Changeset 267446 in webkit

Timestamp:

Sep 22, 2020, 4:43:06 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Used geometry for inline level boxes should be in the coordinate system of the formatting context root
​https://bugs.webkit.org/show_bug.cgi?id=216854

Reviewed by Simon Fraser.

Convert inline level box geometry from relative to the line box to relative to the formatting context root.

• layout/inlineformatting/InlineFormattingContext.cpp:

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

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Used geometry for inline level boxes should be in the coordinate system of the formatting context root
+        https://bugs.webkit.org/show_bug.cgi?id=216854
+
+        Reviewed by Simon Fraser.
+
+        Convert inline level box geometry from relative to the line box to relative to the formatting context root.
+
+        * 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 marginBoxLogicalTopLeft = inlineBox->logicalRect().topLeft();
-            auto borderBoxLogicalTopLeft = marginBoxLogicalTopLeft + InlineLayoutSize({ }, boxGeometry.marginBefore());
-
+            // Inline box coordinates are relative to the line box.
+            // Let's convert top/left relative to the formatting context root.
+            auto borderBoxLogicalTopLeft = lineLogicalRect.topLeft();
             borderBoxLogicalTopLeft.move({ }, lineBoxVerticalOffset);
+            auto inlineBoxLogicalTopLeft = inlineBox->logicalRect().topLeft();
+            // Inline box height includes the margin box. Let's account for that.
+            borderBoxLogicalTopLeft.move(inlineBoxLogicalTopLeft.x(), inlineBoxLogicalTopLeft.y() + boxGeometry.marginBefore());
+
             if (layoutBox.isInFlowPositioned())
                 borderBoxLogicalTopLeft += geometry.inFlowPositionedPositionOffset(layoutBox, horizontalConstraints);