Changeset 124987 in webkit

Timestamp:

Aug 7, 2012 10:25:34 PM (12 years ago)

Author:

ojan@chromium.org

Message:

percentage margins + flex incorrectly overflows the flexbox
​https://bugs.webkit.org/show_bug.cgi?id=93411

Reviewed by Tony Chang.

Source/WebCore:

Percent margins should always be computed with respect to the containing
block's width, not it's height. We were getting this wrong in column flows.

Test: css3/flexbox/percent-margins.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::computeMarginValue):
(WebCore):
(WebCore::RenderFlexibleBox::computeMainAxisPreferredSizes):
(WebCore::RenderFlexibleBox::layoutAndPlaceChildren):

• rendering/RenderFlexibleBox.h:

LayoutTests:

• css3/flexbox/percent-margins-expected.txt: Added.
• css3/flexbox/percent-margins.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/percent-margins-expected.txt (added)
• LayoutTests/css3/flexbox/percent-margins.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-07  Ojan Vafai  <ojan@chromium.org>
+
+        percentage margins + flex incorrectly overflows the flexbox
+        https://bugs.webkit.org/show_bug.cgi?id=93411
+
+        Reviewed by Tony Chang.
+
+        * css3/flexbox/percent-margins-expected.txt: Added.
+        * css3/flexbox/percent-margins.html: Added.
+
 2012-08-07  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-07  Ojan Vafai  <ojan@chromium.org>
+
+        percentage margins + flex incorrectly overflows the flexbox
+        https://bugs.webkit.org/show_bug.cgi?id=93411
+
+        Reviewed by Tony Chang.
+
+        Percent margins should always be computed with respect to the containing
+        block's width, not it's height. We were getting this wrong in column flows.
+
+        Test: css3/flexbox/percent-margins.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::computeMarginValue):
+        (WebCore):
+        (WebCore::RenderFlexibleBox::computeMainAxisPreferredSizes):
+        (WebCore::RenderFlexibleBox::layoutAndPlaceChildren):
+        * rendering/RenderFlexibleBox.h:
+
 2012-08-07  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -759 +759 @@
 }
 
+LayoutUnit RenderFlexibleBox::computeMarginValue(Length margin, LayoutUnit availableSize, RenderView* view)
+{
+    // CSS always computes percent margins with respect to the containing block's width, even for margin-top/margin-bottom.
+    if (margin.isPercent())
+        availableSize = logicalWidth();
+    return minimumValueForLength(margin, availableSize, view);
+}
+
 void RenderFlexibleBox::computeMainAxisPreferredSizes(bool relayoutChildren, OrderHashSet& orderValues)
 {
@@ -781 +789 @@
         // Also, if we're not auto sizing, we don't do a layout that computes the start/end margins.
         if (isHorizontalFlow()) {
-            child->setMarginLeft(minimumValueForLength(child->style()->marginLeft(), flexboxAvailableContentExtent, renderView));
-            child->setMarginRight(minimumValueForLength(child->style()->marginRight(), flexboxAvailableContentExtent, renderView));
+            child->setMarginLeft(computeMarginValue(child->style()->marginLeft(), flexboxAvailableContentExtent, renderView));
+            child->setMarginRight(computeMarginValue(child->style()->marginRight(), flexboxAvailableContentExtent, renderView));
         } else {
-            child->setMarginTop(minimumValueForLength(child->style()->marginTop(), flexboxAvailableContentExtent, renderView));
-            child->setMarginBottom(minimumValueForLength(child->style()->marginBottom(), flexboxAvailableContentExtent, renderView));
+            child->setMarginTop(computeMarginValue(child->style()->marginTop(), flexboxAvailableContentExtent, renderView));
+            child->setMarginBottom(computeMarginValue(child->style()->marginBottom(), flexboxAvailableContentExtent, renderView));
         }
     }

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -120 +120 @@
     LayoutUnit marginBoxAscentForChild(RenderBox*);
 
+    LayoutUnit computeMarginValue(Length margin, LayoutUnit availableSize, RenderView*);
     void computeMainAxisPreferredSizes(bool relayoutChildren, OrderHashSet&);
     LayoutUnit lineBreakLength();