Changeset 93996 in webkit

Timestamp:

Aug 29, 2011 11:53:54 AM (13 years ago)

Author:

tony@chromium.org

Message:

Implement -webkit-flex-pack for horizontal flexboxen
​https://bugs.webkit.org/show_bug.cgi?id=66898

Reviewed by Ojan Vafai.

Source/WebCore:

Test: css3/flexbox/004.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutHorizontalBlock):
(WebCore::hasPackingSpace):
(WebCore::RenderFlexibleBox::runFreeSpaceAllocationAlgorithmHorizontal):

LayoutTests:

• css3/flexbox/004-expected.txt: Added.
• css3/flexbox/004.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/004-expected.txt (added)
• LayoutTests/css3/flexbox/004.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-29  Tony Chang  <tony@chromium.org>
+
+        Implement -webkit-flex-pack for horizontal flexboxen
+        https://bugs.webkit.org/show_bug.cgi?id=66898
+
+        Reviewed by Ojan Vafai.
+
+        * css3/flexbox/004-expected.txt: Added.
+        * css3/flexbox/004.html: Added.
+
 2011-08-29  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-29  Tony Chang  <tony@chromium.org>
+
+        Implement -webkit-flex-pack for horizontal flexboxen
+        https://bugs.webkit.org/show_bug.cgi?id=66898
+
+        Reviewed by Ojan Vafai.
+
+        Test: css3/flexbox/004.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutHorizontalBlock):
+        (WebCore::hasPackingSpace):
+        (WebCore::RenderFlexibleBox::runFreeSpaceAllocationAlgorithmHorizontal):
+
 2011-08-29  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -139 +139 @@
     }
 
-    // FIXME: Distribute leftover space to the packing space (second distribution round).
     // FIXME: Handle distribution of vertical space (third distribution round).
 }
@@ -180 +179 @@
         totalNegativeFlexibility += child->style()->flexboxWidthNegativeFlex();
     }
+}
+
+static bool hasPackingSpace(LayoutUnit availableFreeSpace, float totalPositiveFlexibility)
+{
+    return availableFreeSpace > 0 && !totalPositiveFlexibility;
 }
 
@@ -227 +231 @@
     // Now that we know the sizes, layout and position the flex items.
     LayoutUnit xOffset = borderLeft() + paddingLeft();
+
+    if (hasPackingSpace(availableFreeSpace, totalPositiveFlexibility)) {
+        if (style()->flexPack() == PackEnd)
+            xOffset += availableFreeSpace;
+        else if (style()->flexPack() == PackCenter)
+            xOffset += availableFreeSpace / 2;
+    }
+
     LayoutUnit yOffset = borderTop() + paddingTop();
     setHeight(0);
@@ -248 +260 @@
         child->setLocation(IntPoint(xOffset, yOffset));
         xOffset += child->width() + child->marginRight();
+
+        if (hasPackingSpace(availableFreeSpace, totalPositiveFlexibility) && style()->flexPack() == PackJustify && childSizes.size() > 1)
+            xOffset += availableFreeSpace / (childSizes.size() - 1);
     }
     return true;