Title: [278275] trunk
Revision
278275
Author
[email protected]
Date
2021-05-31 02:22:14 -0700 (Mon, 31 May 2021)

Log Message

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

Patch by Rob Buis <[email protected]> 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 <[email protected]> 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.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (278274 => 278275)


--- trunk/LayoutTests/ChangeLog	2021-05-31 08:29:02 UTC (rev 278274)
+++ trunk/LayoutTests/ChangeLog	2021-05-31 09:22:14 UTC (rev 278275)
@@ -1,3 +1,15 @@
+2021-05-31  Rob Buis  <[email protected]>
+
+        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  <[email protected]>
 
         Go to network in case fetch event is not yet responded when being destroyed instead of failing the load

Added: trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt (0 => 278275)


--- trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash-expected.txt	2021-05-31 09:22:14 UTC (rev 278275)
@@ -0,0 +1 @@
+Passes if it doesn't crash!

Added: trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash.html (0 => 278275)


--- trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash.html	                        (rev 0)
+++ trunk/LayoutTests/fast/css/flex-box-intrinsic-width-crash.html	2021-05-31 09:22:14 UTC (rev 278275)
@@ -0,0 +1,13 @@
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+</script>
+<style>
+  html, body {
+    flex-flow: column;
+    width: intrinsic;
+    writing-mode: vertical-rl;
+    display: flex;
+  }
+</style>
+Passes if it doesn't crash!

Modified: trunk/Source/WebCore/ChangeLog (278274 => 278275)


--- trunk/Source/WebCore/ChangeLog	2021-05-31 08:29:02 UTC (rev 278274)
+++ trunk/Source/WebCore/ChangeLog	2021-05-31 09:22:14 UTC (rev 278275)
@@ -1,3 +1,18 @@
+2021-05-31  Rob Buis  <[email protected]>
+
+        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  <[email protected]>
 
         Go to network in case fetch event is not yet responded when being destroyed instead of failing the load

Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (278274 => 278275)


--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp	2021-05-31 08:29:02 UTC (rev 278274)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp	2021-05-31 09:22:14 UTC (rev 278275)
@@ -875,7 +875,7 @@
 {
     if (flexBasis.isAuto())
         return false;
-    if (isColumnFlow() && flexBasis.isIntrinsic())
+    if (isColumnFlow() && (flexBasis.isIntrinsic() || flexBasis.type() == LengthType::Intrinsic))
         return false;
     if (flexBasis.isPercentOrCalculated())
         return canComputePercentageFlexBasis(child, flexBasis, UpdatePercentageHeightDescendants::No);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to