nesting horizontal flexboxes is broken
authorojan@chromium.org <ojan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Feb 2012 23:37:55 +0000 (23:37 +0000)
committerojan@chromium.org <ojan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Feb 2012 23:37:55 +0000 (23:37 +0000)
commit288f49199716cf9d7218ddae7c4e061818c0b562
treec9a03cda57aa82107e09470ab7807995e4b419ca
parentdaa4f2958bfc654731ddda3603ba2a73f9461aee
nesting horizontal flexboxes is broken
https://bugs.webkit.org/show_bug.cgi?id=76867

Reviewed by David Hyatt.

Source/WebCore:

This is copied from RenderDeprecatedFlexibleBox and updated
for RenderFlexibleBox and to handle vertical writing mode.

Tests: css3/flexbox/preferred-widths-orthogonal.html
       css3/flexbox/preferred-widths.html

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computePreferredLogicalWidths):
* rendering/RenderFlexibleBox.cpp:
(WebCore::marginWidthForChild):
(WebCore):
(WebCore::RenderFlexibleBox::computePreferredLogicalWidths):
* rendering/RenderFlexibleBox.h:
(RenderFlexibleBox):

LayoutTests:

* css3/flexbox/floated-flexbox-expected.txt:
* css3/flexbox/line-wrapping.html:
The old results here were wrong because they wrapped the contents of each flex item.

* css3/flexbox/preferred-widths-expected.txt: Added.
* css3/flexbox/preferred-widths-orthogonal-expected.txt: Added.
* css3/flexbox/preferred-widths-orthogonal.html: Added.
* css3/flexbox/preferred-widths.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@107624 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/css3/flexbox/floated-flexbox-expected.txt
LayoutTests/css3/flexbox/line-wrapping.html
LayoutTests/css3/flexbox/preferred-widths-expected.txt [new file with mode: 0644]
LayoutTests/css3/flexbox/preferred-widths-orthogonal-expected.txt [new file with mode: 0644]
LayoutTests/css3/flexbox/preferred-widths-orthogonal.html [new file with mode: 0644]
LayoutTests/css3/flexbox/preferred-widths.html [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.cpp
Source/WebCore/rendering/RenderFlexibleBox.cpp
Source/WebCore/rendering/RenderFlexibleBox.h