Changeset 143542 in webkit

Timestamp:

Feb 20, 2013 5:22:43 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Incorrect rendering for flex boxes with percentage height in a table cell
​https://bugs.webkit.org/show_bug.cgi?id=110389

Patch by Christian Biesinger <​cbiesinger@chromium.org> on 2013-02-20
Reviewed by Tony Chang.

Source/WebCore:

Tests: css3/flexbox/flex-percentage-height-in-table-standards-mode.html

css3/flexbox/flex-percentage-height-in-table.html

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::layoutAndPlaceChildren):
Always update the logical height of the flex box, not just when it is
auto. If necessary, the later updateLogicalHeight() call will adjust
it.

LayoutTests:

• css3/flexbox/flex-percentage-height-in-table-expected.html: Added.
• css3/flexbox/flex-percentage-height-in-table-standards-mode-expected.html: Added.
• css3/flexbox/flex-percentage-height-in-table-standards-mode.html: Added.
• css3/flexbox/flex-percentage-height-in-table.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/flexbox/flex-percentage-height-in-table-expected.html (added)
• LayoutTests/css3/flexbox/flex-percentage-height-in-table-standards-mode-expected.html (added)
• LayoutTests/css3/flexbox/flex-percentage-height-in-table-standards-mode.html (added)
• LayoutTests/css3/flexbox/flex-percentage-height-in-table.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderFlexibleBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-20  Christian Biesinger  <cbiesinger@chromium.org>
+
+        Incorrect rendering for flex boxes with percentage height in a table cell
+        https://bugs.webkit.org/show_bug.cgi?id=110389
+
+        Reviewed by Tony Chang.
+
+        * css3/flexbox/flex-percentage-height-in-table-expected.html: Added.
+        * css3/flexbox/flex-percentage-height-in-table-standards-mode-expected.html: Added.
+        * css3/flexbox/flex-percentage-height-in-table-standards-mode.html: Added.
+        * css3/flexbox/flex-percentage-height-in-table.html: Added.
+
 2013-02-20  Philip Rogers  <pdr@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-20  Christian Biesinger  <cbiesinger@chromium.org>
+
+        Incorrect rendering for flex boxes with percentage height in a table cell
+        https://bugs.webkit.org/show_bug.cgi?id=110389
+
+        Reviewed by Tony Chang.
+
+        Tests: css3/flexbox/flex-percentage-height-in-table-standards-mode.html
+               css3/flexbox/flex-percentage-height-in-table.html
+
+        * rendering/RenderFlexibleBox.cpp:
+        (WebCore::RenderFlexibleBox::layoutAndPlaceChildren):
+        Always update the logical height of the flex box, not just when it is
+        auto. If necessary, the later updateLogicalHeight() call will adjust
+        it.
+
 2013-02-20  Philip Rogers  <pdr@google.com>
 

trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp

@@ -1135 +1135 @@
         } else
             childCrossAxisMarginBoxExtent = crossAxisExtentForChild(child) + crossAxisMarginExtentForChild(child);
-        if (!isColumnFlow() && style()->logicalHeight().isAuto())
+        if (!isColumnFlow())
             setLogicalHeight(std::max(logicalHeight(), crossAxisOffset + flowAwareBorderAfter() + flowAwarePaddingAfter() + childCrossAxisMarginBoxExtent + crossAxisScrollbarExtent()));
         maxChildCrossAxisExtent = std::max(maxChildCrossAxisExtent, childCrossAxisMarginBoxExtent);