Changeset 95591 in webkit

Timestamp:

Sep 20, 2011 6:30:06 PM (13 years ago)

Author:

ojan@chromium.org

Message:

[css3-flexbox] cleanup padding width calculations
​https://bugs.webkit.org/show_bug.cgi?id=68490

Reviewed by Tony Chang.

No new tests. Existing tests cover the refactor.

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::logicalBorderAndPaddingWidthForChild):
(WebCore::RenderFlexibleBox::logicalScrollbarHeightForChild):
(WebCore::RenderFlexibleBox::preferredLogicalContentWidthForFlexItem):
(WebCore::RenderFlexibleBox::computePreferredLogicalWidth):
(WebCore::RenderFlexibleBox::layoutAndPlaceChildrenInlineDirection):

• rendering/RenderFlexibleBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFlexibleBox.cpp (modified) (5 diffs)
• rendering/RenderFlexibleBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-20  Ojan Vafai  <ojan@chromium.org>
+
+        [css3-flexbox] cleanup padding width calculations
+        https://bugs.webkit.org/show_bug.cgi?id=68490
+
+        Reviewed by Tony Chang.
+
+        No new tests. Existing tests cover the refactor.
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::logicalBorderAndPaddingWidthForChild):
+        (WebCore::RenderFlexibleBox::logicalScrollbarHeightForChild):
+        (WebCore::RenderFlexibleBox::preferredLogicalContentWidthForFlexItem):
+        (WebCore::RenderFlexibleBox::computePreferredLogicalWidth):
+        (WebCore::RenderFlexibleBox::layoutAndPlaceChildrenInlineDirection):
+        * rendering/RenderFlexibleBox.h:
+
 2011-09-19  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -114 +114 @@
 }
 
-LayoutUnit RenderFlexibleBox::logicalBorderWidthForChild(RenderBox* child)
-{
-    if (isHorizontalWritingMode())
-        return child->borderLeft() + child->borderRight();
-    return child->borderTop() + child->borderBottom();
-}
-
-LayoutUnit RenderFlexibleBox::logicalPaddingWidthForChild(RenderBox* child)
-{
-    if (isHorizontalWritingMode())
-        return child->paddingLeft() + child->paddingRight();
-    return child->paddingTop() + child->paddingBottom();
+LayoutUnit RenderFlexibleBox::logicalBorderAndPaddingWidthForChild(RenderBox* child)
+{
+    return isHorizontalWritingMode() ? child->borderAndPaddingWidth() : child->borderAndPaddingHeight();
 }
 
 LayoutUnit RenderFlexibleBox::logicalScrollbarHeightForChild(RenderBox* child)
 {
-    if (isHorizontalWritingMode())
-        return child->horizontalScrollbarHeight();
-    return child->verticalScrollbarWidth();
+    return isHorizontalWritingMode() ? child->verticalScrollbarWidth() : child->horizontalScrollbarHeight();
 }
 
@@ -154 +143 @@
     if (width.isAuto()) {
         LayoutUnit logicalWidth = isHorizontalWritingMode() == child->isHorizontalWritingMode() ? child->maxPreferredLogicalWidth() : child->logicalHeight();
-        return logicalWidth - logicalBorderWidthForChild(child) - logicalScrollbarHeightForChild(child) - logicalPaddingWidthForChild(child);
+        return logicalWidth - logicalBorderAndPaddingWidthForChild(child) - logicalScrollbarHeightForChild(child);
     }
     return isHorizontalWritingMode() ? child->contentWidth() : child->contentHeight();
@@ -205 +194 @@
         child->layoutIfNeeded();
 
+        // We can't just use marginStartForChild, et. al. because "auto" needs to be treated as 0.
         if (isHorizontalWritingMode()) {
             preferredLogicalWidth += child->style()->marginLeft().calcMinValue(flexboxAvailableLogicalWidth);
             preferredLogicalWidth += child->style()->marginRight().calcMinValue(flexboxAvailableLogicalWidth);
-            preferredLogicalWidth += child->style()->paddingLeft().calcMinValue(flexboxAvailableLogicalWidth);
-            preferredLogicalWidth += child->style()->paddingRight().calcMinValue(flexboxAvailableLogicalWidth);
         } else {
             preferredLogicalWidth += child->style()->marginTop().calcMinValue(flexboxAvailableLogicalWidth);
             preferredLogicalWidth += child->style()->marginBottom().calcMinValue(flexboxAvailableLogicalWidth);
-            preferredLogicalWidth += child->style()->paddingTop().calcMinValue(flexboxAvailableLogicalWidth);
-            preferredLogicalWidth += child->style()->paddingBottom().calcMinValue(flexboxAvailableLogicalWidth);
         }
 
@@ -222 +208 @@
             totalPositiveFlexibility += 1;
 
-        preferredLogicalWidth += logicalBorderWidthForChild(child);
+        preferredLogicalWidth += logicalBorderAndPaddingWidthForChild(child);
         preferredLogicalWidth += preferredLogicalContentWidthForFlexItem(child);
 
@@ -306 +292 @@
     for (RenderBox* child = iterator.first(); child; child = iterator.next(), ++i) {
         // FIXME: Does this need to take the scrollbar width into account?
-        LayoutUnit childPreferredSize = childSizes[i] + logicalBorderWidthForChild(child) + logicalPaddingWidthForChild(child);
+        LayoutUnit childPreferredSize = childSizes[i] + logicalBorderAndPaddingWidthForChild(child);
         setLogicalOverrideSize(child, childPreferredSize);
         child->setChildNeedsLayout(true);

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -53 +53 @@
     typedef WTF::HashMap<const RenderBox*, LayoutUnit> InflexibleFlexItemSize;
 
-    LayoutUnit logicalBorderWidthForChild(RenderBox* child);
-    LayoutUnit logicalPaddingWidthForChild(RenderBox* child);
+    LayoutUnit logicalBorderAndPaddingWidthForChild(RenderBox* child);
     LayoutUnit logicalScrollbarHeightForChild(RenderBox* child);
     Length marginStartStyleForChild(RenderBox* child);