Changeset 93547 in webkit

Timestamp:

Aug 22, 2011 2:49:06 PM (13 years ago)

Author:

tony@chromium.org

Message:

handle child margin values when flexing
​https://bugs.webkit.org/show_bug.cgi?id=65887

Reviewed by David Hyatt.

Source/WebCore:

Test: css3/flexbox/002.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeLogicalWidth):

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutHorizontalBlock):
(WebCore::RenderFlexibleBox::computePreferredSize): If the margin is

auto, treat it as flex(1 0 0).

• rendering/RenderObject.cpp:

(WebCore::RenderObject::isFlexibleBoxIncludingDeprecated): Added.

LayoutTests:

• css3/flexbox/002-expected.txt: Added.
• css3/flexbox/002.html: Added.
• css3/flexbox/resources/flexbox.js:

(checkHorizontalBoxen):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/002-expected.txt (added)
• LayoutTests/css3/flexbox/002.html (added)
• LayoutTests/css3/flexbox/resources/flexbox.js (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-22  Tony Chang  <tony@chromium.org>
+
+        handle child margin values when flexing
+        https://bugs.webkit.org/show_bug.cgi?id=65887
+
+        Reviewed by David Hyatt.
+
+        * css3/flexbox/002-expected.txt: Added.
+        * css3/flexbox/002.html: Added.
+        * css3/flexbox/resources/flexbox.js:
+        (checkHorizontalBoxen):
+
 2011-08-22  Peter Kasting  <pkasting@google.com>
 

trunk/LayoutTests/css3/flexbox/resources/flexbox.js

@@ -17 +17 @@
           if (child.offsetWidth && expectedWidth) {
               if (child.offsetWidth != parseInt(expectedWidth)) {
-                  failures += "Expected " + expectedWidth + " but got " + child.offsetWidth + ". ";
+                  failures += "Expected " + expectedWidth + " for width, but got " + child.offsetWidth + ". ";
               }
           }
+
+          var expectedOffset = child.getAttribute && child.getAttribute("data-offset-x");
+          if (child.offsetLeft && expectedOffset) {
+              if (child.offsetLeft != parseInt(expectedOffset)) {
+                  failures += "Expected " + expectedOffset + " for offsetLeft, but got " + child.offsetLeft + ". ";
+              }
+          }
+
           child = child.nextSibling;
       }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-22  Tony Chang  <tony@chromium.org>
+
+        handle child margin values when flexing
+        https://bugs.webkit.org/show_bug.cgi?id=65887
+
+        Reviewed by David Hyatt.
+
+        Test: css3/flexbox/002.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeLogicalWidth):
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutHorizontalBlock):
+        (WebCore::RenderFlexibleBox::computePreferredSize): If the margin is
+            auto, treat it as flex(1 0 0).
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::isFlexibleBoxIncludingDeprecated): Added.
+
 2011-08-22  Nat Duca  <nduca@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1631 +1631 @@
 
     if (!hasPerpendicularContainingBlock && containerLogicalWidth && containerLogicalWidth != (logicalWidth() + marginStart() + marginEnd())
-            && !isFloating() && !isInline() && !cb->isDeprecatedFlexibleBox())
+            && !isFloating() && !isInline() && !cb->isFlexibleBoxIncludingDeprecated())
         cb->setMarginEndForChild(this, containerLogicalWidth - logicalWidth() - cb->marginStartForChild(this));
 }

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -149 +149 @@
         setHeight(std::max(height(), borderTop() + paddingTop() + child->marginTop() + child->height() + child->marginBottom() + paddingBottom() + borderBottom() + horizontalScrollbarHeight()));
 
-        // FIXME: Handle child margins.
+        if (child->style()->marginLeft().isAuto())
+            child->setMarginLeft(availableFreeSpace > 0 ? lroundf(availableFreeSpace / totalPositiveFlexibility) : 0);
+        if (child->style()->marginRight().isAuto())
+            child->setMarginRight(availableFreeSpace > 0 ? lroundf(availableFreeSpace / totalPositiveFlexibility) : 0);
+
+        xOffset += child->marginLeft();
         child->setLocation(IntPoint(xOffset, yOffset));
-        xOffset += child->width();
+        xOffset += child->width() + child->marginRight();
     }
 
@@ -177 +182 @@
         child->layoutIfNeeded();
 
-        // FIXME: Margins and paddings set to auto have a positive flexibility of 1.
         preferredSize += preferredSizeForMarginsAndPadding(child->style()->marginLeft(), flexboxAvailableLogicalWidth);
         preferredSize += preferredSizeForMarginsAndPadding(child->style()->marginRight(), flexboxAvailableLogicalWidth);
@@ -183 +187 @@
         preferredSize += preferredSizeForMarginsAndPadding(child->style()->paddingRight(), flexboxAvailableLogicalWidth);
 
+        if (child->style()->marginLeft().isAuto())
+            totalPositiveFlexibility += 1;
+        if (child->style()->marginRight().isAuto())
+            totalPositiveFlexibility += 1;
+
         preferredSize += child->borderLeft() + child->borderRight();
 

trunk/Source/WebCore/rendering/RenderObject.h

@@ -753 +753 @@
     virtual bool isFlexibleBox() const { return false; }
 #endif
+
+    bool isFlexibleBoxIncludingDeprecated() const
+    {
+#if ENABLE(CSS3_FLEXBOX)
+        return isFlexibleBox() || isDeprecatedFlexibleBox();
+#else
+        return isDeprecatedFlexibleBox();
+#endif
+    }
 
     virtual bool isCombineText() const { return false; }