Changeset 286207 in webkit

Timestamp:

Nov 29, 2021 2:29:38 AM (8 months ago)

Author:

svillar@igalia.com

Message:

[css-flexbox] Do not shrink tables bellow their intrinsic sizes
​https://bugs.webkit.org/show_bug.cgi?id=232383

Reviewed by Manuel Rego Casasnovas.

Source/WebCore:

Flex layout algorithm uses the flex items min|max sizes to compute the hypothetical main size which
will be used to clamp the size of the items when flexed. In the case of tables as flex items, we were
using the min-size straight away whenever that was definite. However we cannot do that because tables
must not shrink bellow their intrinsic sizes. That's why we should select the maximum of the intrinsic
size and the min-size.

This fixes a WPT test covering this case.

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::computeFlexItemMinMaxSizes): Do not select a min-size smaller than the
table intrinsic size in the main axis.

LayoutTests:

• TestExpectations: Unskip table-as-item-fixed-min-width-3.html which works fine now.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-27  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-flexbox] Do not shrink tables bellow their intrinsic sizes
+        https://bugs.webkit.org/show_bug.cgi?id=232383
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        * TestExpectations: Unskip table-as-item-fixed-min-width-3.html which works fine now.
+
 2021-10-27  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/LayoutTests/TestExpectations

@@ -4235 +4235 @@
 
 # Tables as flex items.
-webkit.org/b/221473 imported/w3c/web-platform-tests/css/css-flexbox/table-as-item-fixed-min-width-3.html [ ImageOnlyFailure ]
 webkit.org/b/221473 imported/w3c/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-1.html [ ImageOnlyFailure ]
 webkit.org/b/221473 imported/w3c/web-platform-tests/css/css-flexbox/table-as-item-inflexible-in-column-2.html [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-27  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-flexbox] Do not shrink tables bellow their intrinsic sizes
+        https://bugs.webkit.org/show_bug.cgi?id=232383
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        Flex layout algorithm uses the flex items min|max sizes to compute the hypothetical main size which
+        will be used to clamp the size of the items when flexed. In the case of tables as flex items, we were
+        using the min-size straight away whenever that was definite. However we cannot do that because tables
+        must not shrink bellow their intrinsic sizes. That's why we should select the maximum of the intrinsic
+        size and the min-size.
+
+        This fixes a WPT test covering this case.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::computeFlexItemMinMaxSizes): Do not select a min-size smaller than the
+        table intrinsic size in the main axis.
+
 2021-10-27  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -1324 +1324 @@
     Length min = mainSizeLengthForChild(MinSize, child);
     // Intrinsic sizes in child's block axis are handled by the min-size:auto code path.
-    if (min.isSpecified() || (min.isIntrinsic() && mainAxisIsChildInlineAxis(child)))
-        return { computeMainAxisExtentForChild(child, MinSize, min).value_or(0_lu), maxExtent.value_or(LayoutUnit::max()) };
+    if (min.isSpecified() || (min.isIntrinsic() && mainAxisIsChildInlineAxis(child))) {
+        auto minExtent = computeMainAxisExtentForChild(child, MinSize, min).value_or(0_lu);
+        // We must never return a min size smaller than the min preferred size for tables.
+        if (child.isTable() && mainAxisIsChildInlineAxis(child))
+            minExtent = std::max(minExtent, child.minPreferredLogicalWidth());
+        return { minExtent, maxExtent.value_or(LayoutUnit::max()) };
+    }
     
     if (shouldApplyMinSizeAutoForChild(child)) {