Changeset 291953 in webkit

Timestamp:

Mar 27, 2022 1:38:38 PM (4 months ago)

Author:

Matt Woodrow

Message:

Use the sizing algorithm's available size to compute grid gap.
​https://bugs.webkit.org/show_bug.cgi?id=236956

Reviewed by Tim Nguyen.

Source/WebCore:

Computing the grid gap for subgridded tracks happens during the sizing algorithm
(as part of copying the sizes from the parent, instead of computing new sizes). At
this point we should always have a definite size available (the size of the tracks in
the parent that the subgrid spans), but it may not yet be set on the subgrid's RenderElement.
This retreives the size from the track sizing algorithm instead, where it should always be
available by this point.

• rendering/GridTrackSizingAlgorithm.cpp:

(WebCore::GridTrackSizingAlgorithm::copyUsedTrackSizesForSubgrid):

LayoutTests:

• TestExpectations:

Existing subgrid tests marked as passing.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-03-27  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Use the sizing algorithm's available size to compute grid gap.
+        https://bugs.webkit.org/show_bug.cgi?id=236956
+
+        Reviewed by Tim Nguyen.
+
+        * TestExpectations:
+
+        Existing subgrid tests marked as passing.
+
 2022-03-27  Matt Woodrow  <mattwoodrow@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -1417 +1417 @@
 
 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 ]
 webkit.org/b/236958 imported/w3c/web-platform-tests/css/css-grid/subgrid/repeat-auto-fill-003.html [ ImageOnlyFailure ]
 webkit.org/b/236949 imported/w3c/web-platform-tests/css/css-grid/subgrid/subgrid-mbp-overflow-001.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-03-27  Matt Woodrow  <mattwoodrow@apple.com>
+
+        Use the sizing algorithm's available size to compute grid gap.
+        https://bugs.webkit.org/show_bug.cgi?id=236956
+
+        Reviewed by Tim Nguyen.
+
+        Computing the grid gap for subgridded tracks happens during the sizing algorithm
+        (as part of copying the sizes from the parent, instead of computing new sizes). At
+        this point we should always have a definite size available (the size of the tracks in
+        the parent that the subgrid spans), but it may not yet be set on the subgrid's RenderElement.
+        This retreives the size from the track sizing algorithm instead, where it should always be
+        available by this point.
+
+        * rendering/GridTrackSizingAlgorithm.cpp:
+        (WebCore::GridTrackSizingAlgorithm::copyUsedTrackSizesForSubgrid):
+
 2022-03-27  Matt Woodrow  <mattwoodrow@apple.com>
 

trunk/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp

@@ -1544 +1544 @@
     removeSubgridMarginBorderPaddingFromTracks(allTracks, endMBP, false);
 
-    LayoutUnit gapDifference = (m_renderGrid->gridGap(m_direction) - outer->gridGap(direction)) / 2;
+    LayoutUnit gapDifference = (m_renderGrid->gridGap(m_direction, availableSpace(m_direction)) - outer->gridGap(direction)) / 2;
     for (int i = 0; i < numTracks; i++) {
         LayoutUnit size = allTracks[i].baseSize();