Source/core/rendering/RenderFlexibleBox.cpp - Issue 439063002: flexbox: incorrect flexbox height with overflow:auto on flex item

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/rendering/RenderFlexibleBox.cpp

Issue 439063002: flexbox: incorrect flexbox height with overflow:auto on flex item (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« LayoutTests/css3/flexbox/flexbox-height-with-overflow-auto.html ('K') | « LayoutTests/css3/flexbox/flexbox-height-with-overflow-auto-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderFlexibleBox.cpp

diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp

index c00acbefc313719cac27c313e843e82d5934b162..dbc6444d4bc481cfa8eed9086867d6a56f9285af 100644

--- a/Source/core/rendering/RenderFlexibleBox.cpp

+++ b/Source/core/rendering/RenderFlexibleBox.cpp

@@ -1113,7 +1113,8 @@ void RenderFlexibleBox::layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, cons

childCrossAxisMarginBoxExtent = maxAscent + maxDescent;

} else {

- childCrossAxisMarginBoxExtent = crossAxisIntrinsicExtentForChild(child) + crossAxisMarginExtentForChild(child);

+ LayoutUnit crossAxisScrollbarExtentForChild = isHorizontalFlow() ? child->horizontalScrollbarHeight() : child->verticalScrollbarWidth();

tony 2014/08/07 16:42:30 Nit: I would pull this out into a function to be c

harpreet.sk 2014/08/08 05:35:04 Done.

+ childCrossAxisMarginBoxExtent = crossAxisIntrinsicExtentForChild(child) + crossAxisMarginExtentForChild(child) + crossAxisScrollbarExtentForChild;

}

if (!isColumnFlow())

setLogicalHeight(std::max(logicalHeight(), crossAxisOffset + flowAwareBorderAfter() + flowAwarePaddingAfter() + childCrossAxisMarginBoxExtent + crossAxisScrollbarExtent()));