| Index: Source/core/rendering/RenderFlexibleBox.cpp | 
| diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp | 
| index 9eba7ef763a2200cda43c56f12184b06563e5cfb..4db50d14b5ed83e5d8b734871b1f2801ab310527 100644 | 
| --- a/Source/core/rendering/RenderFlexibleBox.cpp | 
| +++ b/Source/core/rendering/RenderFlexibleBox.cpp | 
| @@ -661,9 +661,7 @@ void RenderFlexibleBox::layoutFlexItems(bool relayoutChildren) | 
| // a line because all our children might be out of flow positioned. | 
| // Instead of just checking if we have a line, make sure the flexbox | 
| // has at least a line's worth of height to cover this case. | 
| -        LayoutUnit minHeight = borderAndPaddingLogicalHeight() | 
| -            + lineHeight(true, isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes) | 
| -            + scrollbarLogicalHeight(); | 
| +        LayoutUnit minHeight = minimumLogicalHeightForEmptyLine(); | 
| if (size().height() < minHeight) | 
| setLogicalHeight(minHeight); | 
| } | 
|  |