Changeset 283321 in webkit

Timestamp:

Sep 30, 2021, 12:15:38 PM (5 years ago)

Author:

Ziran Sun

Message:

[css-grid] Transfer sizes from the aspect-ratio while resolving min-length for auto repetitions
​https://bugs.webkit.org/show_bug.cgi?id=230676

Source/WebCore:

Reviewed by Sergio Villar Senin.

When resolving min-length for auto repetitions, if the min-length on the axis considered is not specified,
we need to check if the min-length on the other axis and the aspect ratio are specified. When both are
specified, we will fetch the transferred min-length for the axis we are considering.

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::computeAutoRepeatTracksCount const):

LayoutTests:

Reviewed by Sergio Villar Senin.

Updated TestExpectations file as two tests with image failures are now passing.

• TestExpectations:

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-09-30  Ziran Sun  <zsun@igalia.com>
+
+        [css-grid]  Transfer sizes from the aspect-ratio while resolving min-length for auto repetitions
+        https://bugs.webkit.org/show_bug.cgi?id=230676
+
+        Reviewed by Sergio Villar Senin.
+
+        Updated TestExpectations file as two tests with image failures are now passing.
+
+        * TestExpectations:
+
 2021-09-30  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -1342 +1342 @@
 webkit.org/b/216146 imported/w3c/web-platform-tests/css/css-grid/alignment/grid-baseline-justify-001.html [ ImageOnlyFailure ]
 
-imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-001.html [ ImageOnlyFailure ]
-imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-002.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html [ ImageOnlyFailure ]
 imported/w3c/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-dynamic-003.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-30  Ziran Sun  <zsun@igalia.com>
+
+        [css-grid]  Transfer sizes from the aspect-ratio while resolving min-length for auto repetitions
+        https://bugs.webkit.org/show_bug.cgi?id=230676
+
+        Reviewed by  Sergio Villar Senin.
+        
+        When resolving min-length for auto repetitions, if the min-length on the axis considered is not specified,
+        we need to check if the min-length on the other axis and the aspect ratio are specified. When both are
+        specified, we will fetch the transferred min-length for the axis we are considering.
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::computeAutoRepeatTracksCount const):
+
 2021-09-30  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -480 +480 @@
 
         const Length& minSize = isRowAxis ? style().logicalMinWidth() : style().logicalMinHeight();
-        if (!availableMaxSize && !minSize.isSpecified())
+        const auto& minSizeForOrthogonalAxis = isRowAxis ? style().logicalMinHeight() : style().logicalMinWidth();
+        bool shouldComputeMinSizeFromAspectRatio = minSizeForOrthogonalAxis.isSpecified() && !shouldIgnoreAspectRatio();
+
+        if (!availableMaxSize && !minSize.isSpecified() && !shouldComputeMinSizeFromAspectRatio)
             return autoRepeatTrackListLength;
 
@@ -489 +492 @@
             LayoutUnit minSizeValue = valueForLength(minSize, containingBlockAvailableSize.value_or(LayoutUnit()));
             availableMinSize = isRowAxis ? adjustContentBoxLogicalWidthForBoxSizing(minSizeValue, minSize.type()) : adjustContentBoxLogicalHeightForBoxSizing(minSizeValue);
-            if (!maxSize.isSpecified())
-                needsToFulfillMinimumSize = true;
-        }
+        } else if (shouldComputeMinSizeFromAspectRatio) {
+            auto [logicalMinWidth, logicalMaxWidth] = computeMinMaxLogicalWidthFromAspectRatio();
+            availableMinSize = logicalMinWidth;
+        }
+        if (!maxSize.isSpecified())
+            needsToFulfillMinimumSize = true;
 
         availableSize = std::max(availableMinSize.value_or(LayoutUnit()), availableMaxSize.value_or(LayoutUnit()));