Changeset 191336 in webkit

Timestamp:

Oct 20, 2015, 2:57:23 AM (11 years ago)

Author:

svillar@igalia.com

Message:

ASSERTION FAILED: computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize) in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
​https://bugs.webkit.org/show_bug.cgi?id=149459

Reviewed by Darin Adler.

Source/WebCore:

This was regressed after 189567 where min-height|width:auto
support was added to flex items. The merge from Blink changes
was not correctly done for assertions. In particular we were
asserting if the resolved main size was not strictly greater
than 0, but 0 is actually a valid value.

Test: fast/flexbox/crash-resolved-main-size-zero.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):

LayoutTests:

• fast/flexbox/crash-resolved-main-size-zero-expected.txt: Added.
• fast/flexbox/crash-resolved-main-size-zero.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/flexbox/crash-resolved-main-size-zero-expected.txt (added)
• LayoutTests/fast/flexbox/crash-resolved-main-size-zero.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-10-13  Sergio Villar Senin  <svillar@igalia.com>
+
+        ASSERTION FAILED: computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize) in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
+        https://bugs.webkit.org/show_bug.cgi?id=149459
+
+        Reviewed by Darin Adler.
+
+        * fast/flexbox/crash-resolved-main-size-zero-expected.txt: Added.
+        * fast/flexbox/crash-resolved-main-size-zero.html: Added.
+
 2015-10-19  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-10-13  Sergio Villar Senin  <svillar@igalia.com>
+
+        ASSERTION FAILED: computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize) in WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax
+        https://bugs.webkit.org/show_bug.cgi?id=149459
+
+        Reviewed by Darin Adler.
+
+        This was regressed after 189567 where min-height|width:auto
+        support was added to flex items. The merge from Blink changes
+        was not correctly done for assertions. In particular we were
+        asserting if the resolved main size was not strictly greater
+        than 0, but 0 is actually a valid value.
+
+        Test: fast/flexbox/crash-resolved-main-size-zero.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
+
 2015-10-20  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -870 +870 @@
         // items. For any other item the value should be 0, this also includes RenderFlexibleBox's derived clases
         // (RenderButton, RenderFullScreen...) because that's just an implementation detail.
-        LayoutUnit contentSize = computeMainAxisExtentForChild(child, MinSize, Length(MinContent)).valueOr(0);
-        ASSERT(computeMainAxisExtentForChild(child, MinSize, Length(MinContent)));
+        LayoutUnit contentSize = computeMainAxisExtentForChild(child, MinSize, Length(MinContent)).value();
+        ASSERT(contentSize >= 0);
         contentSize = std::min(contentSize, maxExtent.valueOr(contentSize));
 
         Length mainSize = isHorizontalFlow() ? child.style().width() : child.style().height();
         if (!mainAxisLengthIsIndefinite(mainSize)) {
-            LayoutUnit resolvedMainSize = computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize).valueOr(0);
-            ASSERT(computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize));
+            LayoutUnit resolvedMainSize = computeMainAxisExtentForChild(child, MainOrPreferredSize, mainSize).value();
+            ASSERT(resolvedMainSize >= 0);
             LayoutUnit specifiedSize = std::min(resolvedMainSize, maxExtent.valueOr(resolvedMainSize));