Changeset 274419 in webkit

Timestamp:

Mar 15, 2021 6:18:25 AM (16 months ago)

Author:

commit-queue@webkit.org

Message:

Treat min-intrinsic like *-content
​https://bugs.webkit.org/show_bug.cgi?id=222854

Patch by Rob Buis <​rbuis@igalia.com> on 2021-03-15
Reviewed by Sergio Villar Senin.

Source/WebCore:

Treat min-intrinsic like *-content for intrinsic logical
content calculations.

Test: fast/flexbox/indefinite-width-crash.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeIntrinsicLogicalContentHeightUsing const):
(WebCore::RenderBox::computeContentAndScrollbarLogicalHeightUsing const):

LayoutTests:

Add test for this.

• fast/flexbox/indefinite-width-crash-expected.txt: Added.
• fast/flexbox/indefinite-width-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/flexbox/indefinite-width-crash-expected.txt (added)
• LayoutTests/fast/flexbox/indefinite-width-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-03-15  Rob Buis  <rbuis@igalia.com>
+
+        Treat min-intrinsic like *-content
+        https://bugs.webkit.org/show_bug.cgi?id=222854
+
+        Reviewed by Sergio Villar Senin.
+
+        Add test for this.
+
+        * fast/flexbox/indefinite-width-crash-expected.txt: Added.
+        * fast/flexbox/indefinite-width-crash.html: Added.
+
 2021-03-15  Imanol Fernandez  <ifernandez@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-15  Rob Buis  <rbuis@igalia.com>
+
+        Treat min-intrinsic like *-content
+        https://bugs.webkit.org/show_bug.cgi?id=222854
+
+        Reviewed by Sergio Villar Senin.
+
+        Treat min-intrinsic like *-content for intrinsic logical
+        content calculations.
+
+        Test: fast/flexbox/indefinite-width-crash.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeIntrinsicLogicalContentHeightUsing const):
+        (WebCore::RenderBox::computeContentAndScrollbarLogicalHeightUsing const):
+
 2021-03-15  Imanol Fernandez  <ifernandez@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -3023 +3023 @@
     // 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.
-    if (logicalHeightLength.isMinContent() || logicalHeightLength.isMaxContent() || logicalHeightLength.isFitContent()) {
-        if (!intrinsicContentHeight)
-            return intrinsicContentHeight;
-        if (style().boxSizing() == BoxSizing::BorderBox)
+    if (logicalHeightLength.isMinContent() || logicalHeightLength.isMaxContent() || logicalHeightLength.isFitContent() || logicalHeightLength.isMinIntrinsic()) {
+        if (intrinsicContentHeight && style().boxSizing() == BoxSizing::BorderBox)
             return intrinsicContentHeight.value() + borderAndPaddingLogicalHeight();
         return intrinsicContentHeight;
@@ -3042 +3040 @@
     // 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.
-    if (height.isIntrinsic())
+    if (height.isIntrinsic() || height.isMinIntrinsic())
         return computeIntrinsicLogicalContentHeightUsing(height, intrinsicContentHeight, borderAndPaddingLogicalHeight());
     if (height.isFixed())