Changeset 290577 in webkit

Timestamp:

Feb 27, 2022 7:03:39 PM (5 months ago)

Author:

Matt Woodrow

Message:

Compute correct containing block override size for items that are subgridden in one dimension only.
​https://bugs.webkit.org/show_bug.cgi?id=236951

Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Added new WPT similar to auto-track-sizing-001 which adds new variations
with nested subgrids and varying whether the other axis is subgridded.

• web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002-expected.html: Added.
• web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002.html: Added.

Source/WebCore:

Items that are subgridded in one dimension will be included in the track sizing algorithm of the
outer grid for that dimension. When measuring their size in the subgridded dimension, we need to
set their containing block size in the other (non-subgridded) dimension, which is only available
from the subgrid's track sizing, not the outer track sizes.

This recurses up to set the override size on the subgrid element instead, and forces a layout
there, which should copy down subgrid track sizes and compute the other dimension, making it
available on the inner item we need.

Test: imported/w3c/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002.html

• rendering/GridLayoutFunctions.cpp:

(WebCore::GridLayoutFunctions::extraMarginForSubgridAncestors):

• rendering/GridLayoutFunctions.h:
• rendering/GridTrackSizingAlgorithm.cpp:

(WebCore::GridTrackSizingAlgorithmStrategy::updateOverridingContainingBlockContentSizeForChild const):

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::isSubgridOf):

• rendering/RenderGrid.h:

LayoutTests:

• TestExpectations:

Marked existing WPT as passing.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002-expected.html (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/GridLayoutFunctions.cpp (modified) (1 diff)
• Source/WebCore/rendering/GridLayoutFunctions.h (modified) (1 diff)
• Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-02-27  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Compute correct containing block override size for items that are subgridden in one dimension only.
+        https://bugs.webkit.org/show_bug.cgi?id=236951
+
+        Reviewed by Dean Jackson.
+
+        * TestExpectations:
+
+        Marked existing WPT as passing.
+
 2022-02-27  Matt Woodrow  <mattwoodrow@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -1395 +1395 @@
 imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/masonry-subgrid-002.html [ ImageOnlyFailure ]
 
-webkit.org/b/236951 imported/w3c/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-001.html [ ImageOnlyFailure ]
 webkit.org/b/236959 imported/w3c/web-platform-tests/css/css-grid/subgrid/baseline-001.html [ ImageOnlyFailure ]
 webkit.org/b/236956 imported/w3c/web-platform-tests/css/css-grid/subgrid/grid-gap-003.html [ ImageOnlyFailure ]

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-27  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Compute correct containing block override size for items that are subgridden in one dimension only.
+        https://bugs.webkit.org/show_bug.cgi?id=236951
+
+        Reviewed by Dean Jackson.
+
+        Added new WPT similar to auto-track-sizing-001 which adds new variations
+        with nested subgrids and varying whether the other axis is subgridded.
+
+        * web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002-expected.html: Added.
+        * web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002.html: Added.
+
 2022-02-27  Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-27  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Compute correct containing block override size for items that are subgridden in one dimension only.
+        https://bugs.webkit.org/show_bug.cgi?id=236951
+
+        Reviewed by Dean Jackson.
+
+        Items that are subgridded in one dimension will be included in the track sizing algorithm of the
+        outer grid for that dimension. When measuring their size in the subgridded dimension, we need to
+        set their containing block size in the other (non-subgridded) dimension, which is only available
+        from the subgrid's track sizing, not the outer track sizes.
+
+        This recurses up to set the override size on the subgrid element instead, and forces a layout
+        there, which should copy down subgrid track sizes and compute the other dimension, making it
+        available on the inner item we need.
+
+        Test: imported/w3c/web-platform-tests/css/css-grid/subgrid/auto-track-sizing-002.html
+
+        * rendering/GridLayoutFunctions.cpp:
+        (WebCore::GridLayoutFunctions::extraMarginForSubgridAncestors):
+        * rendering/GridLayoutFunctions.h:
+        * rendering/GridTrackSizingAlgorithm.cpp:
+        (WebCore::GridTrackSizingAlgorithmStrategy::updateOverridingContainingBlockContentSizeForChild const):
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::isSubgridOf):
+        * rendering/RenderGrid.h:
+
 2022-02-27  Matt Woodrow  <mattwoodrow@apple.com>
 

trunk/Source/WebCore/rendering/GridLayoutFunctions.cpp

@@ -104 +104 @@
 }
 
-static LayoutUnit extraMarginForSubgridAncestors(GridTrackSizingDirection direction, const RenderBox& child)
+LayoutUnit extraMarginForSubgridAncestors(GridTrackSizingDirection direction, const RenderBox& child)
 {
     const RenderGrid* grid = downcast<RenderGrid>(child.parent());

trunk/Source/WebCore/rendering/GridLayoutFunctions.h

@@ -51 +51 @@
 bool isFlippedDirection(const RenderGrid&, GridTrackSizingDirection);
 bool isSubgridReversedDirection(const RenderGrid&, GridTrackSizingDirection outerDirection, const RenderGrid& subgrid);
+LayoutUnit extraMarginForSubgridAncestors(GridTrackSizingDirection, const RenderBox& child);
 
 }

trunk/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp

@@ -966 +966 @@
         overrideSize = m_algorithm.gridAreaBreadthForChild(child, direction);
 
+    if (renderGrid() != child.parent()) {
+        RenderGrid* grid = downcast<RenderGrid>(child.parent());
+
+        GridTrackSizingDirection subgridDirection = GridLayoutFunctions::flowAwareDirectionForChild(*renderGrid(), *grid, direction);
+
+        if (grid->isSubgridOf(subgridDirection, *renderGrid())) {
+            // If the item is subgridded in this direction (and thus the tracks it covers are tracks
+            // owned by this sizing algorithm), then we want to take the breadth of the tracks we occupy,
+            // and subtract any space occupied by the subgrid itself (and any ancestor subgrids).
+            *overrideSize -= GridLayoutFunctions::extraMarginForSubgridAncestors(subgridDirection, child);
+        } else {
+            // Otherwise the tracks that this item covers (in this non-subgridded axis) are owned
+            // by one of the intermediate RenderGrids (which are subgrids in the other axis). Recurse
+            // until we find an element this is directly part of this grid and set the override size
+            // for that, and then layout that item so that it computes the track sizes and sets the
+            // override size we need.
+            bool overrideSizeHasChanged =
+                updateOverridingContainingBlockContentSizeForChild(*grid, direction);
+            layoutGridItemForMinSizeComputation(*grid, overrideSizeHasChanged);
+            return overrideSizeHasChanged;
+        }
+    }
+
     if (GridLayoutFunctions::hasOverridingContainingBlockContentSizeForChild(child, direction) && GridLayoutFunctions::overridingContainingBlockContentSizeForChild(child, direction) == overrideSize)
         return false;

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -1627 +1627 @@
     GridTrackSizingDirection direction = GridLayoutFunctions::flowAwareDirectionForChild(*downcast<RenderGrid>(parent()), *this, parentDirection);
     return isSubgrid(direction);
+}
+
+bool RenderGrid::isSubgridOf(GridTrackSizingDirection direction, const RenderGrid& ancestor)
+{
+    if (!isSubgrid(direction))
+        return false;
+    if (parent() == &ancestor)
+        return true;
+
+    auto& parentGrid = *downcast<RenderGrid>(parent());
+    GridTrackSizingDirection parentDirection = GridLayoutFunctions::flowAwareDirectionForParent(parentGrid, *this, direction);
+    return parentGrid.isSubgridOf(parentDirection, ancestor);
 }
 

trunk/Source/WebCore/rendering/RenderGrid.h

@@ -97 +97 @@
     }
     bool isSubgridInParentDirection(GridTrackSizingDirection parentDirection) const;
+
+    // Returns true if this grid is inheriting subgridded tracks for
+    // the given direction from the specified ancestor. This handles
+    // nested subgrids, where ancestor may not be our direct parent.
+    bool isSubgridOf(GridTrackSizingDirection, const RenderGrid& ancestor);
+
     bool mayBeSubgridExcludingAbsPos(GridTrackSizingDirection) const;