Changeset 285497 in webkit

Timestamp:

Nov 9, 2021 6:48:01 AM (8 months ago)

Author:

Ziran Sun

Message:

[css-grid] update the content-sized grid width before laying out a grid item with block constraints and aspect-ratio
​https://bugs.webkit.org/show_bug.cgi?id=231802

Reviewed by Javier Fernandez.
Source/WebCore:

For a grid item with an aspect-ratio, if it has block-constraints such as the relative logical height
case we consider in this CL, 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/GridLayoutFunctions.h:
• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::layoutBlock):
(WebCore::RenderGrid::updateGridAreaForAspectRatioItems):

• rendering/RenderGrid.h:

LayoutTests:

Unskip the tests that are now passing and add a new test to check track size updates.

• imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-005-expected.html: Added.
• imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-005.html: Added.
• TestExpectations:
• platform/ios-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-005-expected.html (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-005.html (added)
• LayoutTests/platform/ios-wk2/TestExpectations (modified) (1 diff)
• 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/RenderGrid.cpp (modified) (5 diffs)
• Source/WebCore/rendering/RenderGrid.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-09  Ziran Sun  <zsun@igalia.com>
+
+        [css-grid] update the content-sized grid width before laying out a grid item with block constraints and aspect-ratio
+        https://bugs.webkit.org/show_bug.cgi?id=231802
+
+        Reviewed by Javier Fernandez.
+        
+        Unskip the tests that are now passing and add a new test to check track size updates.
+
+        * imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-005-expected.html: Added.
+        * imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-005.html: Added.
+        * TestExpectations:
+        * platform/ios-wk2/TestExpectations:
+
 2021-11-09  Alan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -1400 +1400 @@
 imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-009.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-grid/layout-algorithm/flex-sizing-rows-indefinite-height.html [ ImageOnlyFailure ]
-webkit.org/b/231021 imported/w3c/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-size-dynamic-block-size.html [ ImageOnlyFailure ]
 webkit.org/b/231021 imported/w3c/web-platform-tests/css/css-grid/layout-algorithm/grid-template-flexible-rerun-track-sizing.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-grid/masonry/tentative/masonry-align-content-001.html [ ImageOnlyFailure ]

trunk/LayoutTests/platform/ios-wk2/TestExpectations

@@ -1994 +1994 @@
 webkit.org/b/209461 imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-item-dynamic-min-contribution-001.html [ Failure ]
 
-webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-001.html [ ImageOnlyFailure ]
-webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-002.html [ ImageOnlyFailure ]
-webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/aspect-ratio-003.html [ ImageOnlyFailure ]
 webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-001.html [ ImageOnlyFailure ]
 webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/grid-item-inline-contribution-002.html [ ImageOnlyFailure ]
-webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/replaced-element-011.html [ ImageOnlyFailure ]
-webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/replaced-element-012.html [ ImageOnlyFailure ]
-webkit.org/b/227283 imported/w3c/web-platform-tests/css/css-grid/grid-items/replaced-element-013.html [ ImageOnlyFailure ]
 
 webkit.org/b/215929 compositing/video/poster.html [ Pass Timeout ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-09  Ziran Sun  <zsun@igalia.com>
+
+        [css-grid] update the content-sized grid width before laying out a grid item with block constraints and aspect-ratio
+        https://bugs.webkit.org/show_bug.cgi?id=231802
+
+        Reviewed by Javier Fernandez.
+
+        For a grid item with an aspect-ratio, if it has block-constraints such as the relative logical height
+        case we consider in this CL, 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/GridLayoutFunctions.h:
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::layoutBlock):
+        (WebCore::RenderGrid::updateGridAreaForAspectRatioItems):
+        * rendering/RenderGrid.h:
+
 2021-11-09  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/GridLayoutFunctions.cpp

@@ -83 +83 @@
 }
 
+bool isAspectRatioBlockSizeDependentChild(const RenderBox& child)
+{
+    return (child.style().hasAspectRatio() || child.hasIntrinsicAspectRatio()) && child.hasRelativeLogicalHeight();
+}
+
 GridTrackSizingDirection flowAwareDirectionForChild(const RenderGrid& grid, const RenderBox& child, GridTrackSizingDirection direction)
 {

trunk/Source/WebCore/rendering/GridLayoutFunctions.h

@@ -41 +41 @@
 LayoutUnit marginLogicalSizeForChild(const RenderGrid&, GridTrackSizingDirection, const RenderBox&);
 bool isOrthogonalChild(const RenderGrid&, const RenderBox&);
+bool isAspectRatioBlockSizeDependentChild(const RenderBox&);
 GridTrackSizingDirection flowAwareDirectionForChild(const RenderGrid&, const RenderBox&, GridTrackSizingDirection);
 bool hasOverridingContainingBlockContentSizeForChild(const RenderBox&, GridTrackSizingDirection);

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -162 +162 @@
     // cases with orthogonal flows require this extra cycle; we need a more specific
     // condition to detect whether child's min-content contribution has changed or not.
-    if (m_hasAnyOrthogonalItem || m_trackSizingAlgorithm.hasAnyPercentSizedRowsIndefiniteHeight()) {
+    if (m_hasAnyOrthogonalItem || m_trackSizingAlgorithm.hasAnyPercentSizedRowsIndefiniteHeight() || m_hasAspectRatioBlockSizeDependentItem) {
         computeTrackSizesForDefiniteSize(ForColumns, availableSpaceForColumns);
         computeContentPositionAndDistributionOffset(ForColumns, m_trackSizingAlgorithm.freeSpace(ForColumns).value(), nonCollapsedTracks(ForColumns));
@@ -200 +200 @@
         bool hasDefiniteLogicalHeight = RenderBlock::hasDefiniteLogicalHeight() || hasOverridingLogicalHeight() || computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), std::nullopt);
         m_hasAnyOrthogonalItem = false;
+        m_hasAspectRatioBlockSizeDependentItem = false;
+        Vector<RenderBox*> aspectRatioBlockSizeDependentGridItems;
         for (auto* child = firstChildBox(); child; child = child->nextSiblingBox()) {
             if (child->isOutOfFlowPositioned())
@@ -211 +213 @@
             if (GridLayoutFunctions::isOrthogonalChild(*this, *child))
                 m_hasAnyOrthogonalItem = true;
-
+            
+            // For a grid item that has an aspect-ratio and block-constraints such as the relative logical height,
+            // when the grid width is auto, we may need get the real grid width before laying out the item. 
+            if (GridLayoutFunctions::isAspectRatioBlockSizeDependentChild(*child) && (style().logicalWidth().isAuto() || style().logicalWidth().isMinContent() || style().logicalWidth().isMaxContent())) {
+                aspectRatioBlockSizeDependentGridItems.append(child);
+                m_hasAspectRatioBlockSizeDependentItem = true;
+            }
             // We keep a cache of items with baseline as alignment values so
             // that we only compute the baseline shims for such items. This
@@ -274 +282 @@
         computeContentPositionAndDistributionOffset(ForRows, m_trackSizingAlgorithm.freeSpace(ForRows).value(), nonCollapsedTracks(ForRows));
 
+        if (!aspectRatioBlockSizeDependentGridItems.isEmpty()) {
+            updateGridAreaForAspectRatioItems(aspectRatioBlockSizeDependentGridItems);
+            updateLogicalWidth();
+        }
+
         // 3- If the min-content contribution of any grid items have changed based on the row
         // sizes calculated in step 2, steps 1 and 2 are repeated with the new min-content
@@ -941 +954 @@
     child.setOverridingContainingBlockContentLogicalWidth(width);
     child.setOverridingContainingBlockContentLogicalHeight(height);
+}
+
+void RenderGrid::updateGridAreaForAspectRatioItems(const Vector<RenderBox*>& autoGridItems)
+{
+    populateGridPositionsForDirection(ForColumns);
+    populateGridPositionsForDirection(ForRows);
+
+    for (auto& autoGridItem : autoGridItems) 
+        updateGridAreaLogicalSize(*autoGridItem, gridAreaBreadthForChildIncludingAlignmentOffsets(*autoGridItem, ForColumns), gridAreaBreadthForChildIncludingAlignmentOffsets(*autoGridItem, ForRows));
 }
 

trunk/Source/WebCore/rendering/RenderGrid.h

@@ -131 +131 @@
     void repeatTracksSizingIfNeeded(LayoutUnit availableSpaceForColumns, LayoutUnit availableSpaceForRows);
 
+    void updateGridAreaForAspectRatioItems(const Vector<RenderBox*>&);
     void layoutGridItems();
     void populateGridPositionsForDirection(GridTrackSizingDirection);
@@ -205 +206 @@
 
     bool m_hasAnyOrthogonalItem {false};
+    bool m_hasAspectRatioBlockSizeDependentItem { false };
     bool m_baselineItemsCached {false};
 };