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())); |