Changeset 110747 in webkit

Timestamp:

Mar 14, 2012 2:10:24 PM (12 years ago)

Author:

tony@chromium.org

Message:

multiline column flexbox with auto height wrap too much
​https://bugs.webkit.org/show_bug.cgi?id=80929

Reviewed by David Hyatt.

Source/WebCore:

Test: css3/flexbox/multiline-column-auto.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeLogicalHeightUsing):
(WebCore):
(WebCore::RenderBox::computeContentLogicalHeightUsing): Pull out into a separate method.

• rendering/RenderBox.h:

(RenderBox):

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::lineBreakLength): Compute the value based on height & max-height for column layout.
(WebCore):
(WebCore::RenderFlexibleBox::computeNextFlexLine):

• rendering/RenderFlexibleBox.h:

(RenderFlexibleBox):

LayoutTests:

• css3/flexbox/multiline-column-auto-expected.txt: Added.
• css3/flexbox/multiline-column-auto.html: Added.
• css3/flexbox/multiline-shrink-to-fit-expected.html:
• css3/flexbox/multiline-shrink-to-fit.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/multiline-column-auto-expected.txt (added)
• LayoutTests/css3/flexbox/multiline-column-auto.html (added)
• LayoutTests/css3/flexbox/multiline-shrink-to-fit-expected.html (modified) (2 diffs)
• LayoutTests/css3/flexbox/multiline-shrink-to-fit.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.h (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-14  Tony Chang  <tony@chromium.org>
+
+        multiline column flexbox with auto height wrap too much
+        https://bugs.webkit.org/show_bug.cgi?id=80929
+
+        Reviewed by David Hyatt.
+
+        * css3/flexbox/multiline-column-auto-expected.txt: Added.
+        * css3/flexbox/multiline-column-auto.html: Added.
+        * css3/flexbox/multiline-shrink-to-fit-expected.html:
+        * css3/flexbox/multiline-shrink-to-fit.html:
+
 2012-03-14  Jessie Berlin  <jberlin@apple.com>
 

trunk/LayoutTests/css3/flexbox/multiline-shrink-to-fit-expected.html

@@ -34 +34 @@
 <p>Test to make sure that multiline column flexboxes shrink-to-fit properly.</p>
 
-<!-- FIXME: Remove the height once https://bugs.webkit.org/show_bug.cgi?id=80929 is fixed. -->
 <div class="testcase" style="height: 60px; width: 400px">
   <div style="width: 100px; height: 20px"></div>
@@ -57 +56 @@
 <p style="clear:left">The grey background should be 400px wide.</p>
 
-<!-- FIXME: Remove the height once https://bugs.webkit.org/show_bug.cgi?id=80929 is fixed. -->
 <div style="width: 150px">
 <div class="testcase" style="height: 60px; width: 150px">

trunk/LayoutTests/css3/flexbox/multiline-shrink-to-fit.html

@@ -27 +27 @@
 <p>Test to make sure that multiline column flexboxes shrink-to-fit properly.</p>
 
-<!-- FIXME: Remove the height once https://bugs.webkit.org/show_bug.cgi?id=80929 is fixed. -->
-<div class="flexbox" style="height: 60px">
+<div class="flexbox">
   <div style="width: 100px; height: 20px"></div>
   <div style="width: 100px; height: 10px"></div>
@@ -44 +43 @@
 <p style="clear:left">The grey background should be 400px wide.</p>
 
-<!-- FIXME: Remove the height once https://bugs.webkit.org/show_bug.cgi?id=80929 is fixed. -->
 <div style="width: 150px">
-<div class="flexbox" style="height: 60px">
+<div class="flexbox">
   <div style="width: 100px; height: 20px"></div>
   <div style="width: 100px; height: 10px"></div>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-14  Tony Chang  <tony@chromium.org>
+
+        multiline column flexbox with auto height wrap too much
+        https://bugs.webkit.org/show_bug.cgi?id=80929
+
+        Reviewed by David Hyatt.
+
+        Test: css3/flexbox/multiline-column-auto.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeLogicalHeightUsing):
+        (WebCore):
+        (WebCore::RenderBox::computeContentLogicalHeightUsing): Pull out into a separate method.
+        * rendering/RenderBox.h:
+        (RenderBox):
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::lineBreakLength): Compute the value based on height & max-height for column layout.
+        (WebCore):
+        (WebCore::RenderFlexibleBox::computeNextFlexLine):
+        * rendering/RenderFlexibleBox.h:
+        (RenderFlexibleBox):
+
 2012-03-14  Xingnan Wang  <xingnan.wang@intel.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2153 +2153 @@
 }
 
-LayoutUnit RenderBox::computeLogicalHeightUsing(const Length& h)
+LayoutUnit RenderBox::computeLogicalHeightUsing(const Length& height)
+{
+    LayoutUnit logicalHeight = computeContentLogicalHeightUsing(height);
+    if (logicalHeight != -1)
+        logicalHeight = computeBorderBoxLogicalHeight(logicalHeight);
+    return logicalHeight;
+}
+
+LayoutUnit RenderBox::computeContentLogicalHeightUsing(const Length& height)
 {
     LayoutUnit logicalHeight = -1;
-    if (!h.isAuto()) {
-        if (h.isFixed())
-            logicalHeight = h.value();
-        else if (h.isPercent())
-            logicalHeight = computePercentageLogicalHeight(h);
-        if (logicalHeight != -1) {
-            logicalHeight = computeBorderBoxLogicalHeight(logicalHeight);
-            return logicalHeight;
-        }
+    if (!height.isAuto()) {
+        if (height.isFixed())
+            logicalHeight = height.value();
+        else if (height.isPercent())
+            logicalHeight = computePercentageLogicalHeight(height);
     }
     return logicalHeight;

trunk/Source/WebCore/rendering/RenderBox.h

@@ -342 +342 @@
     LayoutUnit computeLogicalWidthInRegionUsing(LogicalWidthType, LayoutUnit availableLogicalWidth, const RenderBlock* containingBlock, RenderRegion*, LayoutUnit offsetFromLogicalTopOfFirstPage);
     LayoutUnit computeLogicalHeightUsing(const Length& height);
+    LayoutUnit computeContentLogicalHeightUsing(const Length& height);
     LayoutUnit computeReplacedLogicalWidthUsing(Length width) const;
     LayoutUnit computeReplacedLogicalWidthRespectingMinMaxWidth(LayoutUnit logicalWidth, bool includeMaxWidth = true) const;

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -670 +670 @@
 }
 
+LayoutUnit RenderFlexibleBox::lineBreakLength()
+{
+    if (!isColumnFlow())
+        return mainAxisContentExtent();
+
+    LayoutUnit height = computeContentLogicalHeightUsing(style()->logicalHeight());
+    if (height == -1)
+        height = std::numeric_limits<LayoutUnit>::max();
+    LayoutUnit maxHeight = computeContentLogicalHeightUsing(style()->logicalMaxHeight());
+    if (maxHeight != -1)
+        height = std::min(height, maxHeight);
+    return height;
+}
+
 bool RenderFlexibleBox::computeNextFlexLine(FlexOrderIterator& iterator, OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, float& totalPositiveFlexibility, float& totalNegativeFlexibility)
 {
@@ -678 +692 @@
     if (!iterator.currentChild())
         return false;
+
+    LayoutUnit lineBreak = lineBreakLength();
 
     for (RenderBox* child = iterator.currentChild(); child; child = iterator.next()) {
@@ -691 +707 @@
             childMainAxisExtent += child->marginHeight();
 
-        // FIXME: For auto sized column flexbox, mainAxisContentExtent (the height) hasn't been computed yet so we break
-        // after the first child. If the height is auto, we need to look at max-height to determine the line breaks.
-        // https://bugs.webkit.org/show_bug.cgi?id=80929
-        if (isMultiline() && preferredMainAxisExtent + childMainAxisExtent > mainAxisContentExtent() && orderedChildren.size() > 0)
+        if (isMultiline() && preferredMainAxisExtent + childMainAxisExtent > lineBreak && orderedChildren.size() > 0)
             break;
         orderedChildren.append(child);

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -104 +104 @@
 
     void computeMainAxisPreferredSizes(bool relayoutChildren, FlexOrderHashSet&);
+    LayoutUnit lineBreakLength();
     bool computeNextFlexLine(FlexOrderIterator&, OrderedFlexItemList& orderedChildren, LayoutUnit& preferredMainAxisExtent, float& totalPositiveFlexibility, float& totalNegativeFlexibility);
     bool runFreeSpaceAllocationAlgorithm(const OrderedFlexItemList&, LayoutUnit& availableFreeSpace, float& totalPositiveFlexibility, float& totalNegativeFlexibility, InflexibleFlexItemSize&, WTF::Vector<LayoutUnit>& childSizes);