Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Issue 11017062: Merge 130549 - Deprecated flexboxes subtract scrollbar width/height twice (Closed)

Created:
8 years, 2 months ago by ojan
Modified:
8 years, 2 months ago
Reviewers:
ojan
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Visibility:
Public.

Description

Merge 130549 - Deprecated flexboxes subtract scrollbar width/height twice https://bugs.webkit.org/show_bug.cgi?id=98552 Reviewed by Tony Chang. Source/WebCore: This is a regression from http://trac.webkit.org/changeset/119507. The problem is that contentHeight subtracts the scrollbar and RenderDeprecatedFlexbox subtracts the scrollbar. -Make it so that we only access override sizes if one has been set. I think this makes the calling code more clear. -If we don't have one set, grab the height/width - borderAndPadding. -Add a FIXME to change this all back to being borderbox sizes. There's something trick with making table padding/border work right for that though (noted in the original patch). Test: fast/flexbox/flexing-overflow-scroll-item.html * rendering/RenderBox.cpp: (WebCore::RenderBox::overrideLogicalContentWidth): (WebCore::RenderBox::overrideLogicalContentHeight): (WebCore::RenderBox::availableLogicalHeightUsing): * rendering/RenderBox.h: (RenderBox): * rendering/RenderDeprecatedFlexibleBox.cpp: (WebCore::contentWidthForChild): (WebCore): (WebCore::contentHeightForChild): (WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox): (WebCore::RenderDeprecatedFlexibleBox::layoutVerticalBox): (WebCore::RenderDeprecatedFlexibleBox::allowedChildFlex): LayoutTests: * fast/flexbox/flexing-overflow-scroll-item-expected.txt: Added. * fast/flexbox/flexing-overflow-scroll-item.html: Added. TBR=ojan@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=130951

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+33 lines, -12 lines) Patch
A + LayoutTests/fast/flexbox/flexing-overflow-scroll-item.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/flexbox/flexing-overflow-scroll-item-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M Source/WebCore/rendering/RenderBox.h View 1 chunk +4 lines, -0 lines 0 comments Download
M Source/WebCore/rendering/RenderBox.cpp View 2 chunks +9 lines, -6 lines 0 comments Download
M Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp View 9 chunks +22 lines, -8 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
ojan
8 years, 2 months ago (2012-10-10 20:36:51 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698