Changeset 272648 in webkit

Timestamp:

Feb 10, 2021, 6:49:45 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Add inline box vertical border/padding to enclosing top and bottom
​https://bugs.webkit.org/show_bug.cgi?id=221647

Reviewed by Antti Koivisto.

While inline boxes (<span>) don't stretch the line box vertically with their paddings and borders,
we need those boxes to be included in the enclosing top/bottom geometries.
This is also in preparation for supporting inline box overflow scroll.

• layout/inlineformatting/InlineFormattingContext.cpp:

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

• layout/integration/LayoutIntegrationCoverage.cpp:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-10  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Add inline box vertical border/padding to enclosing top and bottom
+        https://bugs.webkit.org/show_bug.cgi?id=221647
+
+        Reviewed by Antti Koivisto.
+
+        While inline boxes (<span>) don't stretch the line box vertically with their paddings and borders,
+        we need those boxes to be included in the enclosing top/bottom geometries.
+        This is also in preparation for supporting inline box overflow scroll. 
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::computeGeometryForLineContent):
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+
 2021-02-10  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

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

@@ -527 +527 @@
             if (lineRun.isInlineBoxStart()) {
                 auto& boxGeometry = formattingState.boxGeometry(layoutBox);
-                formattingState.addLineRun({ lineIndex, layoutBox, lineBox.logicalMarginRectForInlineLevelBox(layoutBox, boxGeometry), lineRun.expansion(), { } });
+                auto inlineBoxLogicalRect = lineBox.logicalMarginRectForInlineLevelBox(layoutBox, boxGeometry);
+                formattingState.addLineRun({ lineIndex, layoutBox, inlineBoxLogicalRect, lineRun.expansion(), { } });
                 inlineBoxStartSet.add(&layoutBox);
-                // FIXME: Add enclosing top and bottom support.
+                enclosingTopAndBottom.top = std::min(enclosingTopAndBottom.top, inlineBoxLogicalRect.top());
                 continue;
             }
             if (lineRun.isInlineBoxEnd()) {
                 inlineBoxEndSet.add(&layoutBox);
+                auto inlineBoxLogicalRect = lineBox.logicalMarginRectForInlineLevelBox(layoutBox, formattingState.boxGeometry(layoutBox));
+                enclosingTopAndBottom.bottom = std::max(enclosingTopAndBottom.bottom, inlineBoxLogicalRect.bottom());
                 continue;
             }