Changeset 268644 in webkit

Timestamp:

Oct 17, 2020 7:36:12 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][Integration] Atomic inline level box run height includes the vertical margin
​https://bugs.webkit.org/show_bug.cgi?id=217873

Reviewed by Antti Koivisto.

RenderBox::setLocation takes the border box location. Let's not include the margin before value.
(Atomic inline level box runs include the margin box per spec, see ​https://www.w3.org/TR/css-inline-3/#line-layout)

• layout/integration/LayoutIntegrationLineLayout.cpp:

(WebCore::LayoutIntegration::LineLayout::constructContent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationLineLayout.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-17  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Atomic inline level box run height includes the vertical margin
+        https://bugs.webkit.org/show_bug.cgi?id=217873
+
+        Reviewed by Antti Koivisto.
+
+        RenderBox::setLocation takes the border box location. Let's not include the margin before value.
+        (Atomic inline level box runs include the margin box per spec, see https://www.w3.org/TR/css-inline-3/#line-layout)
+
+        * layout/integration/LayoutIntegrationLineLayout.cpp:
+        (WebCore::LayoutIntegration::LineLayout::constructContent):
+
 2020-10-17  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp

@@ -167 +167 @@
             if (layoutBox.isReplacedBox()) {
                 auto& renderer = downcast<RenderBox>(*rendererForLayoutBox(layoutBox));
-                const_cast<RenderBox&>(renderer).setLocation(flooredLayoutPoint(runRect.location()));
+                auto borderBoxLocation = FloatPoint { runRect.x(), runRect.y() + m_layoutState.geometryForBox(layoutBox).marginBefore() };
+                const_cast<RenderBox&>(renderer).setLocation(flooredLayoutPoint(borderBoxLocation));
             }
         }