Changeset 295633 in webkit for trunk/Source/WebCore/rendering/RenderBox.cpp

Timestamp:

Jun 17, 2022, 6:35:02 AM (3 years ago)

Author:

Alan Bujtas

Message:

Remove redundant logical right computation for grid items in RenderBlock::computeOverflow
​https://bugs.webkit.org/show_bug.cgi?id=241689

Reviewed by Simon Fraser.

If the grid content produces layout overflow, we should not need to re-compute it again by looping through the grid items.

1. Decouple "include padding end" and "include child's margin end" logic
2. Decouple "include padding after" and "include padding end" logic.
3. Restore RenderFlexibleBox and RenderGrid computeOverflow calls to pre-r282463 (when clientLogicalRightAndBottomAfterRepositioning was introduced)

• LayoutTests/fast/overflow/grid-horizontal-overflow-with-padding-end-expected.html: Added.
• LayoutTests/fast/overflow/grid-horizontal-overflow-with-padding-end.html: Added.
• Source/WebCore/rendering/RenderBlock.cpp:

(WebCore::RenderBlock::computeOverflow):
(WebCore::RenderBlock::layoutOverflowLogicalBottom):
(WebCore::RenderBlock::clientLogicalRightAndBottomAfterRepositioning const): Deleted.

• Source/WebCore/rendering/RenderBlock.h:
• Source/WebCore/rendering/RenderBox.cpp:

(WebCore::RenderBox::layoutOverflowRectForPropagation const):

• Source/WebCore/rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutBlock):

• Source/WebCore/rendering/RenderGrid.cpp:

(WebCore::RenderGrid::layoutBlock):

Canonical link: ​https://commits.webkit.org/251638@main

File:

• trunk/Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -5234 +5234 @@
 {
     // Only propagate interior layout overflow if we don't completely clip it.
-    LayoutRect rect = borderBoxRect();
+    auto rect = borderBoxRect();
+    if (isGridItem()) {
+        // As per https://github.com/w3c/csswg-drafts/issues/3653, child's margins should contribute to the scrollable overflow area.
+        // FIXME: Expand it to non-grid cases when applicable.
+        rect.setWidth(rect.width() + std::max(0_lu, marginEnd()));
+    }
     if (!shouldApplyLayoutContainment()) {
         if (style().overflowX() == Overflow::Clip && style().overflowY() == Overflow::Visible) {