Changeset 285987 in webkit

Timestamp:

Nov 18, 2021 1:12:50 AM (8 months ago)

Author:

Ziran Sun

Message:

[css-grid] Transfer size for grid item with an aspect-ratio and stretch alignment against the definite row
​https://bugs.webkit.org/show_bug.cgi?id=232987

Reviewed by Javier Fernandez.

Source/WebCore:

For a grid item with an aspect-ratio, if it has stretch alignment against the definite row, it should
try and resolve it if possible and transfer this size into the inline direction for the min/max content
size. For the case that the grid width is content sized, we need to update the width before laying out
the grid items. Since the min-content contribution of the grid item has changed based on the row sizes
calculated in step 2 of sizing algorithm, we also need to repeat the sizing algorithm steps to update
the width of the track sizes.

• rendering/GridLayoutFunctions.cpp:

(WebCore::GridLayoutFunctions::isAspectRatioBlockSizeDependentChild):

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::updateGridAreaForAspectRatioItems):

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::needsPreferredWidthsRecalculation const):

LayoutTests:

• TestExpectations: unskip the test that is now passing.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/GridLayoutFunctions.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderReplaced.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-18  Ziran Sun  <zsun@igalia.com>
+
+        [css-grid] Transfer size for grid item with an aspect-ratio and stretch alignment against the definite row
+        https://bugs.webkit.org/show_bug.cgi?id=232987
+
+        Reviewed by Javier Fernandez.
+
+        * TestExpectations: unskip the test that is now passing.
+
 2021-11-17  Youenn Fablet  <youenn@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -1396 +1396 @@
 imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-repeat-max-width-001.html [ ImageOnlyFailure ]
 
-imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-004.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-003.html [ ImageOnlyFailure ]
 webkit.org/b/231021 imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-size-with-orthogonal-child-dynamic.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-18  Ziran Sun  <zsun@igalia.com>
+
+        [css-grid] Transfer size for grid item with an aspect-ratio and stretch alignment against the definite row
+        https://bugs.webkit.org/show_bug.cgi?id=232987
+
+        Reviewed by Javier Fernandez.
+
+        For a grid item with an aspect-ratio, if it has stretch alignment against the definite row, it should
+        try and resolve it if possible and transfer this size into the inline direction for the min/max content
+        size. For the case that the grid width is content sized, we need to update the width before laying out
+        the grid items. Since the min-content contribution of the grid item has changed based on the row sizes
+        calculated in step 2 of sizing algorithm, we also need to repeat the sizing algorithm steps to update
+        the width of the track sizes.
+
+        * rendering/GridLayoutFunctions.cpp:
+        (WebCore::GridLayoutFunctions::isAspectRatioBlockSizeDependentChild):
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::updateGridAreaForAspectRatioItems):
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::needsPreferredWidthsRecalculation const):
+
 2021-11-18 Antoine Quint  <graouts@webkit.org>
 

trunk/Source/WebCore/rendering/GridLayoutFunctions.cpp

@@ -85 +85 @@
 bool isAspectRatioBlockSizeDependentChild(const RenderBox& child)
 {
-    return (child.style().hasAspectRatio() || child.hasIntrinsicAspectRatio()) && child.hasRelativeLogicalHeight();
+    return (child.style().hasAspectRatio() || child.hasIntrinsicAspectRatio()) && (child.hasRelativeLogicalHeight() || child.hasStretchedLogicalHeight());
 }
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -961 +961 @@
     populateGridPositionsForDirection(ForRows);
 
-    for (auto& autoGridItem : autoGridItems) 
+    for (auto& autoGridItem : autoGridItems) {
         updateGridAreaLogicalSize(*autoGridItem, gridAreaBreadthForChildIncludingAlignmentOffsets(*autoGridItem, ForColumns), gridAreaBreadthForChildIncludingAlignmentOffsets(*autoGridItem, ForRows));
+        // For an item wtih aspect-ratio, if it has stretch alignment that stretches to the definite row, we also need to transfer the size before laying out the grid item.
+        if (autoGridItem->hasStretchedLogicalHeight())
+            applyStretchAlignmentToChildIfNeeded(*autoGridItem);
+    }
 }
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -803 +803 @@
 {
     // If the height is a percentage and the width is auto, then the containingBlocks's height changing can cause this node to change it's preferred width because it maintains aspect ratio.
-    return hasRelativeLogicalHeight() && style().logicalWidth().isAuto();
-}
-
-}
+    return (hasRelativeLogicalHeight() || (isGridItem() && hasStretchedLogicalHeight())) && style().logicalWidth().isAuto();
+}
+
+}