Changeset 278275 in webkit

Timestamp:

May 31, 2021, 2:22:14 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Source/WebCore:
Treat width: intrinsic as non definite
​https://bugs.webkit.org/show_bug.cgi?id=226367

Patch by Rob Buis <​rbuis@igalia.com> on 2021-05-31
Reviewed by Darin Adler.

Treat width: intrinsic as non definite in
childMainSizeIsDefinite.

Test: fast/css/flex-box-intrinsic-width-crash.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::childMainSizeIsDefinite):

LayoutTests:
Release assert in RenderFlexibleBox::computeInnerFlexBaseSizeForChild via RenderFlexibleBox::layoutFlexItems
​https://bugs.webkit.org/show_bug.cgi?id=226367

Patch by Rob Buis <​rbuis@igalia.com> on 2021-05-31
Reviewed by Darin Adler.

Add test for this.

• fast/css/flex-box-intrinsic-width-crash-expected.txt: Added.
• fast/css/flex-box-intrinsic-width-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt (added)
• LayoutTests/fast/css/flex-box-intrinsic-width-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-05-31  Rob Buis  <rbuis@igalia.com>
+
+        Release assert in RenderFlexibleBox::computeInnerFlexBaseSizeForChild via RenderFlexibleBox::layoutFlexItems
+        https://bugs.webkit.org/show_bug.cgi?id=226367
+
+        Reviewed by Darin Adler.
+
+        Add test for this.
+
+        * fast/css/flex-box-intrinsic-width-crash-expected.txt: Added.
+        * fast/css/flex-box-intrinsic-width-crash.html: Added.
+
 2021-05-31  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-31  Rob Buis  <rbuis@igalia.com>
+
+        Treat width: intrinsic as non definite
+        https://bugs.webkit.org/show_bug.cgi?id=226367
+
+        Reviewed by Darin Adler.
+
+        Treat width: intrinsic as non definite in
+        childMainSizeIsDefinite.
+
+        Test: fast/css/flex-box-intrinsic-width-crash.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::childMainSizeIsDefinite):
+
 2021-05-31  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -876 +876 @@
     if (flexBasis.isAuto())
         return false;
-    if (isColumnFlow() && flexBasis.isIntrinsic())
+    if (isColumnFlow() && (flexBasis.isIntrinsic() || flexBasis.type() == LengthType::Intrinsic))
         return false;
     if (flexBasis.isPercentOrCalculated())