Changeset 294744 in webkit

Timestamp:

May 24, 2022, 7:22:19 AM (4 years ago)

Author:

Oriol Brufau

Message:

Obey intrinsic min-height in nested column flex container
​https://bugs.webkit.org/show_bug.cgi?id=240068

Reviewed by Sergio Villar Senin.

Fixes a regression from bug 230755. An intrinsic min-height should make
a column flex container grow enough for its contents, even if it's also
a flex item with a small definite flex-basis like 0px.

Test: imported/w3c/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-031.html

Canonical link: ​https://commits.webkit.org/250912@main

Location:

trunk

Files:

• LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-031-expected.txt (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-031.html (added)
• Source/WebCore/rendering/RenderBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3267 +3267 @@
         if (intrinsicContentHeight)
             return adjustIntrinsicLogicalHeightForBoxSizing(intrinsicContentHeight.value());
-        return intrinsicContentHeight;
+        return std::nullopt;
     }
     if (logicalHeightLength.isFillAvailable())
@@ -3277 +3277 @@
 std::optional<LayoutUnit> RenderBox::computeContentAndScrollbarLogicalHeightUsing(SizeType heightType, const Length& height, std::optional<LayoutUnit> intrinsicContentHeight) const
 {
-    if (height.isAuto())
-        return heightType == MinSize ? std::optional<LayoutUnit>(0) : std::nullopt;
+    if (height.isAuto()) {
+        if (heightType != MinSize)
+            return std::nullopt;
+        if (intrinsicContentHeight && isFlexItem() && downcast<RenderFlexibleBox>(parent())->shouldApplyMinBlockSizeAutoForChild(*this))
+            return adjustIntrinsicLogicalHeightForBoxSizing(intrinsicContentHeight.value());
+        return std::optional<LayoutUnit>(0);
+    }
     // FIXME: The CSS sizing spec is considering changing what min-content/max-content should resolve to.
     // If that happens, this code will have to change.

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -522 +522 @@
 
     return (minSize.isAuto() || childBlockSizeIsEquivalentToAutomaticSize) && (mainAxisOverflowForChild(child) == Overflow::Visible);
+}
+
+bool RenderFlexibleBox::shouldApplyMinBlockSizeAutoForChild(const RenderBox& child) const
+{
+    return !mainAxisIsChildInlineAxis(child) && shouldApplyMinSizeAutoForChild(child);
 }
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -91 +91 @@
     enum class GapType { BetweenLines, BetweenItems };
     LayoutUnit computeGap(GapType) const;
+
+    bool shouldApplyMinBlockSizeAutoForChild(const RenderBox&) const;
 
 protected: