Changeset 136660 in webkit

Timestamp:

Dec 5, 2012 2:24:55 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Flex item auto margins in the cross direction should safe center
​https://bugs.webkit.org/show_bug.cgi?id=103919

Reviewed by Ojan Vafai.

Source/WebCore:

Do not apply auto margins for cross axis if there's no alignment
space available.

Test: css3/flexbox/flex-flow-auto-margins-no-available-space.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::alignChildren): Make sure we pass a
positive value for availableAlignmentSpace to
updateAutoMarginsInCrossAxis().

LayoutTests:

• css3/flexbox/flex-flow-auto-margins-no-available-space-expected.txt: Added.
• css3/flexbox/flex-flow-auto-margins-no-available-space.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/flex-flow-auto-margins-no-available-space-expected.txt (added)
• LayoutTests/css3/flexbox/flex-flow-auto-margins-no-available-space.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-12-05  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Flex item auto margins in the cross direction should safe center
+        https://bugs.webkit.org/show_bug.cgi?id=103919
+
+        Reviewed by Ojan Vafai.
+
+        * css3/flexbox/flex-flow-auto-margins-no-available-space-expected.txt: Added.
+        * css3/flexbox/flex-flow-auto-margins-no-available-space.html: Added.
+
 2012-12-05  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-05  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Flex item auto margins in the cross direction should safe center
+        https://bugs.webkit.org/show_bug.cgi?id=103919
+
+        Reviewed by Ojan Vafai.
+
+        Do not apply auto margins for cross axis if there's no alignment
+        space available.
+
+        Test: css3/flexbox/flex-flow-auto-margins-no-available-space.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::alignChildren): Make sure we pass a
+        positive value for availableAlignmentSpace to
+        updateAutoMarginsInCrossAxis().
+
 2012-12-05  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -781 +781 @@
 void RenderFlexibleBox::updateAutoMarginsInMainAxis(RenderBox* child, LayoutUnit autoMarginOffset)
 {
+    ASSERT(autoMarginOffset >= 0);
+
     if (isHorizontalFlow()) {
         if (child->style()->marginLeft().isAuto())
@@ -811 +813 @@
 {
     ASSERT(!child->isOutOfFlowPositioned());
+    ASSERT(availableAlignmentSpace >= 0);
 
     bool isHorizontal = isHorizontalFlow();
@@ -1296 +1299 @@
             }
 
-            if (updateAutoMarginsInCrossAxis(child, availableAlignmentSpaceForChild(lineCrossAxisExtent, child)))
+            if (updateAutoMarginsInCrossAxis(child, std::max(LayoutUnit(0), availableAlignmentSpaceForChild(lineCrossAxisExtent, child))))
                 continue;