Index: Source/core/rendering/RenderFlexibleBox.cpp |
diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp |
index c00acbefc313719cac27c313e843e82d5934b162..cc13a48bf12bc10843501effaa697800a0d5ea38 100644 |
--- a/Source/core/rendering/RenderFlexibleBox.cpp |
+++ b/Source/core/rendering/RenderFlexibleBox.cpp |
@@ -1111,9 +1111,9 @@ void RenderFlexibleBox::layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, cons |
maxAscent = std::max(maxAscent, ascent); |
maxDescent = std::max(maxDescent, descent); |
- childCrossAxisMarginBoxExtent = maxAscent + maxDescent; |
+ childCrossAxisMarginBoxExtent = maxAscent + maxDescent + child->scrollbarLogicalHeight(); |
cbiesinger
2014/08/06 02:52:49
Doesn't this have to be scrollbarLogicalWidth for
harpreet.sk
2014/08/06 13:20:23
@Chris: Thanks for the comment. Yes it has to be s
|
} else { |
- childCrossAxisMarginBoxExtent = crossAxisIntrinsicExtentForChild(child) + crossAxisMarginExtentForChild(child); |
+ childCrossAxisMarginBoxExtent = crossAxisIntrinsicExtentForChild(child) + crossAxisMarginExtentForChild(child) + child->scrollbarLogicalHeight(); |
} |
if (!isColumnFlow()) |
setLogicalHeight(std::max(logicalHeight(), crossAxisOffset + flowAwareBorderAfter() + flowAwarePaddingAfter() + childCrossAxisMarginBoxExtent + crossAxisScrollbarExtent())); |