Changeset 131972 in webkit

Timestamp:

Oct 19, 2012 6:49:10 PM (12 years ago)

Author:

tony@chromium.org

Message:

RenderFlexibleBox::preferredMainAxisContentExtentForChild can return a negative value
​https://bugs.webkit.org/show_bug.cgi?id=97827

Reviewed by Ojan Vafai.

I'm pretty sure this isn't possible (logicalHeight and maxPreferredLogicalWidth should always include
border and padding), so just add an assert.

No new tests, the assert is for code clarity.

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-19  Tony Chang  <tony@chromium.org>
+
+        RenderFlexibleBox::preferredMainAxisContentExtentForChild can return a negative value
+        https://bugs.webkit.org/show_bug.cgi?id=97827
+
+        Reviewed by Ojan Vafai.
+
+        I'm pretty sure this isn't possible (logicalHeight and maxPreferredLogicalWidth should always include
+        border and padding), so just add an assert.
+
+        No new tests, the assert is for code clarity.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):
+
 2012-10-19  Tony Chang  <tony@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -665 +665 @@
     if (flexBasis.isAuto()) {
         LayoutUnit mainAxisExtent = hasOrthogonalFlow(child) ? child->logicalHeight() : child->maxPreferredLogicalWidth();
+        ASSERT(mainAxisExtent - mainAxisBorderAndPaddingExtentForChild(child) >= 0);
         return mainAxisExtent - mainAxisBorderAndPaddingExtentForChild(child);
     }