Changeset 124793 in webkit

Timestamp:

Aug 6, 2012 12:17:20 PM (12 years ago)

Author:

ojan@chromium.org

Message:

need tests to ensure flexboxes play nicely with box-sizing
​https://bugs.webkit.org/show_bug.cgi?id=70771

Reviewed by Tony Chang.

Source/WebCore:

Anytime we grab the width/height off of the RenderStyle, we need to adjust
it for box-sizing. Fortunately, we only do this two places in RenderFlexibleBox.
Also, delete crossAxisLength since it's unused.

Test: css3/flexbox/box-sizing.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):

• rendering/RenderFlexibleBox.h:

LayoutTests:

• css3/flexbox/box-sizing-expected.txt: Added.
• css3/flexbox/box-sizing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/box-sizing-expected.txt (added)
• LayoutTests/css3/flexbox/box-sizing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderFlexibleBox.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-31  Ojan Vafai  <ojan@chromium.org>
+
+        need tests to ensure flexboxes play nicely with box-sizing
+        https://bugs.webkit.org/show_bug.cgi?id=70771
+
+        Reviewed by Tony Chang.
+
+        * css3/flexbox/box-sizing-expected.txt: Added.
+        * css3/flexbox/box-sizing.html: Added.
+
 2012-08-06  John J. Barton  <johnjbarton@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-31  Ojan Vafai  <ojan@chromium.org>
+
+        need tests to ensure flexboxes play nicely with box-sizing
+        https://bugs.webkit.org/show_bug.cgi?id=70771
+
+        Reviewed by Tony Chang.
+
+        Anytime we grab the width/height off of the RenderStyle, we need to adjust
+        it for box-sizing. Fortunately, we only do this two places in RenderFlexibleBox.
+        Also, delete crossAxisLength since it's unused.
+
+        Test: css3/flexbox/box-sizing.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):
+        * rendering/RenderFlexibleBox.h:
+
 2012-08-06  John J. Barton  <johnjbarton@chromium.org>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -361 +361 @@
 }
 
-Length RenderFlexibleBox::crossAxisLength() const
-{
-    return isHorizontalFlow() ? style()->height() : style()->width();
-}
-
 void RenderFlexibleBox::setCrossAxisExtent(LayoutUnit extent)
 {
@@ -411 +406 @@
     if (heightIncludingScrollbar == -1)
         return -1;
-    return std::max(LayoutUnit(0), heightIncludingScrollbar - scrollbarLogicalHeight());
+    return std::max(LayoutUnit(0), computeContentBoxLogicalHeight(heightIncludingScrollbar) - scrollbarLogicalHeight());
 }
 
@@ -610 +605 @@
         return mainAxisExtent - mainAxisBorderAndPaddingExtentForChild(child);
     }
-    return std::max(LayoutUnit(0), minimumValueForLength(flexBasis, mainAxisContentExtent(), view()));
+    LayoutUnit extent = minimumValueForLength(flexBasis, mainAxisContentExtent(), view());
+    extent = isColumnFlow() ? child->computeContentBoxLogicalHeight(extent) : child->computeContentBoxLogicalWidth(extent);
+    return std::max(LayoutUnit(0), extent);
 }
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.h

@@ -78 +78 @@
     bool isLeftToRightFlow() const;
     bool isMultiline() const;
-    Length crossAxisLength() const;
     Length flexBasisForChild(RenderBox* child) const;
     void setCrossAxisExtent(LayoutUnit);