REGRESSION: flexbox content-size fails to exclude scrollbar
authortony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Aug 2012 00:54:19 +0000 (00:54 +0000)
committertony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Aug 2012 00:54:19 +0000 (00:54 +0000)
commit3188c22642a7893f6d69c358694b7a6e8f23fd96
tree9dcb2fcdb05094681fb7afede741b29b3d16d78a
parent652c2ad2cd3ab510896a4ef6206d585b620b88a7
REGRESSION: flexbox content-size fails to exclude scrollbar
https://bugs.webkit.org/show_bug.cgi?id=92667

Reviewed by Ojan Vafai.

Source/WebCore:

In r123909, we switched to computing the height using computeContentLogicalHeightUsing().
Unfortunately, this includes the scrollbar when we want the content height. Add a helper
method for computing the value needed by flexbox.

Test: css3/flexbox/content-height-with-scrollbars.html

* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::mainAxisContentExtent): Use computeLogicalClientHeight
(WebCore::RenderFlexibleBox::computeLogicalClientHeight): Add new method for taking scrollbar into consideration.
(WebCore::RenderFlexibleBox::computeAvailableFreeSpace): Use computeLogicalClientHeight
(WebCore::RenderFlexibleBox::lineBreakLength): Use computeLogicalClientHeight
* rendering/RenderFlexibleBox.h:

LayoutTests:

Add column flow test cases with scrollbars forced on.

* css3/flexbox/content-height-with-scrollbars-expected.html: Added.
* css3/flexbox/content-height-with-scrollbars.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@124278 268f45cc-cd09-0410-ab3c-d52691b4dbfc
LayoutTests/ChangeLog
LayoutTests/css3/flexbox/content-height-with-scrollbars-expected.html [new file with mode: 0644]
LayoutTests/css3/flexbox/content-height-with-scrollbars.html [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderFlexibleBox.cpp
Source/WebCore/rendering/RenderFlexibleBox.h