Changeset 112333 in webkit

Timestamp:

Mar 27, 2012 4:56:11 PM (12 years ago)

Author:

tony@chromium.org

Message:

use the correct size when computing flex-pack space
​https://bugs.webkit.org/show_bug.cgi?id=82378

Reviewed by Ojan Vafai.

Source/WebCore:

Fix 2 bugs:

• We weren't properly updating available space before computing packing space. If a min/max is not hit, we still need to adjust the available free space.
• For flex-pack:end, we need to put the overflow in the start edge.

New test cases in css3/flexbox/flex-pack.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::resolveFlexibleLengths):
(WebCore::initialPackingOffset):

LayoutTests:

• css3/flexbox/flex-pack-expected.txt:
• css3/flexbox/flex-pack.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/flex-pack-expected.txt (modified) (1 diff)
• LayoutTests/css3/flexbox/flex-pack.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-27  Tony Chang  <tony@chromium.org>
+
+        use the correct size when computing flex-pack space
+        https://bugs.webkit.org/show_bug.cgi?id=82378
+
+        Reviewed by Ojan Vafai.
+
+        * css3/flexbox/flex-pack-expected.txt:
+        * css3/flexbox/flex-pack.html:
+
 2012-03-27  Dirk Pranke  <dpranke@chromium.org>
 

trunk/LayoutTests/css3/flexbox/flex-pack-expected.txt

@@ -9 +9 @@
 PASS
 PASS
+PASS
+PASS
+PASS
+PASS
+PASS

trunk/LayoutTests/css3/flexbox/flex-pack.html

@@ -50 +50 @@
 </div>
 
+<div class="flexbox" style="-webkit-flex-pack: center">
+  <div data-expected-width="200" data-offset-x="0" style="width: -webkit-flex(1 100px);"></div>
+  <div data-expected-width="200" data-offset-x="200" style="width: -webkit-flex(1 100px);"></div>
+  <div data-expected-width="200" data-offset-x="400" style="width: -webkit-flex(1 100px);"></div>
+</div>
+
+<!-- True centering on overflow. -->
+<div class="flexbox" style="-webkit-flex-pack: center">
+  <div data-expected-width="800" data-offset-x="-100" style="width: 800px;"></div>
+</div>
+
 <div class="flexbox" style="-webkit-flex-pack: justify">
   <div data-expected-width="100" data-offset-x="0" style="width: -webkit-flex(1 0 0); max-width: 100px;"></div>
   <div data-expected-width="100" data-offset-x="250" style="width: 100px;"></div>
   <div data-expected-width="100" data-offset-x="500" style="width: 100px;"></div>
+</div>
+
+<div class="flexbox" style="-webkit-flex-pack: justify">
+  <div data-expected-width="200" data-offset-x="0" style="width: -webkit-flex(1 100px);"></div>
+  <div data-expected-width="200" data-offset-x="200" style="width: -webkit-flex(1 100px);"></div>
+  <div data-expected-width="200" data-offset-x="400" style="width: -webkit-flex(1 100px);"></div>
 </div>
 
@@ -70 +87 @@
 <div class="flexbox" style="-webkit-flex-pack: distribute">
   <div data-expected-width="100" data-offset-x="250" style="width: -webkit-flex(1 0 0); max-width: 100px;"></div>
+</div>
+
+<!-- True centering on overflow. -->
+<div class="flexbox" style="-webkit-flex-pack: distribute">
+  <div data-expected-width="800" data-offset-x="-100" style="width: 800px;"></div>
 </div>
 
@@ -89 +111 @@
 </div>
 
+<!-- We overflow the flexbox (no negative flexing) and align the end. The overflow is to the left. -->
+<div class="flexbox" style="-webkit-flex-pack: end">
+  <div data-expected-width="300" data-offset-x="-100" style="width: -webkit-flex(1 300px);"></div>
+  <div data-expected-width="200" data-offset-x="200" style="width: 200px;"></div>
+  <div data-expected-width="200" data-offset-x="400" style="width: 200px;"></div>
+</div>
+
 </body>
 </html>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-27  Tony Chang  <tony@chromium.org>
+
+        use the correct size when computing flex-pack space
+        https://bugs.webkit.org/show_bug.cgi?id=82378
+
+        Reviewed by Ojan Vafai.
+
+        Fix 2 bugs:
+        - We weren't properly updating available space before computing
+          packing space. If a min/max is not hit, we still need to adjust
+          the available free space.
+        - For flex-pack:end, we need to put the overflow in the start edge.
+
+        New test cases in css3/flexbox/flex-pack.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::resolveFlexibleLengths):
+        (WebCore::initialPackingOffset):
+
 2012-03-27  Dana Jansens  <danakj@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -770 +770 @@
     LayoutUnit flexboxAvailableContentExtent = mainAxisContentExtent();
     LayoutUnit totalViolation = 0;
+    LayoutUnit usedFreeSpace = 0;
     WTF::Vector<Violation> minViolations;
     WTF::Vector<Violation> maxViolations;
@@ -782 +783 @@
             childSizes.append(inflexibleItems.get(child));
         else {
-            LayoutUnit childSize = preferredMainAxisContentExtentForChild(child);
+            LayoutUnit preferredChildSize = preferredMainAxisContentExtentForChild(child);
+            LayoutUnit childSize = preferredChildSize;
             if (availableFreeSpace > 0 && totalPositiveFlexibility > 0 && flexSign == PositiveFlexibility)
                 childSize += lroundf(availableFreeSpace * positiveFlexForChild(child) / totalPositiveFlexibility);
@@ -790 +792 @@
             LayoutUnit adjustedChildSize = adjustChildSizeForMinAndMax(child, childSize, flexboxAvailableContentExtent);
             childSizes.append(adjustedChildSize);
+            usedFreeSpace += adjustedChildSize - preferredChildSize;
 
             LayoutUnit violation = adjustedChildSize - childSize;
@@ -802 +805 @@
     if (totalViolation)
         freezeViolations(totalViolation < 0 ? maxViolations : minViolations, availableFreeSpace, totalPositiveFlexibility, totalNegativeFlexibility, inflexibleItems);
+    else
+        availableFreeSpace -= usedFreeSpace;
+
     return !totalViolation;
 }
@@ -807 +813 @@
 static LayoutUnit initialPackingOffset(LayoutUnit availableFreeSpace, EFlexPack flexPack, size_t numberOfChildren)
 {
-    if (availableFreeSpace > 0) {
-        if (flexPack == PackEnd)
-            return availableFreeSpace;
-        if (flexPack == PackCenter)
-            return availableFreeSpace / 2;
-        if (flexPack == PackDistribute && numberOfChildren)
+    if (flexPack == PackEnd)
+        return availableFreeSpace;
+    if (flexPack == PackCenter)
+        return availableFreeSpace / 2;
+    if (flexPack == PackDistribute) {
+        if (availableFreeSpace > 0 && numberOfChildren)
             return availableFreeSpace / (2 * numberOfChildren);
-    } else if (availableFreeSpace < 0) {
-        if (flexPack == PackCenter || flexPack == PackDistribute)
+        if (availableFreeSpace < 0)
             return availableFreeSpace / 2;
     }