Chromium Code Reviews| Index: Source/core/rendering/RenderGrid.cpp |
| diff --git a/Source/core/rendering/RenderGrid.cpp b/Source/core/rendering/RenderGrid.cpp |
| index 07451ab9878f5f4a62b554b0e3ef2095ebbbbafb..8baf47e8190c9e76845d4ed226f8046ef07b657e 100644 |
| --- a/Source/core/rendering/RenderGrid.cpp |
| +++ b/Source/core/rendering/RenderGrid.cpp |
| @@ -1148,8 +1148,14 @@ void RenderGrid::layoutGridItems() |
| setLogicalHeight(logicalHeight() + row.baseSize()); |
| // Min / max logical height is handled by the call to updateLogicalHeight in layoutBlock. |
| - |
| setLogicalHeight(logicalHeight() + borderAndPaddingLogicalHeight()); |
| + if (hasLineIfEmpty()) { |
| + LayoutUnit minHeight = borderAndPaddingLogicalHeight() |
| + + lineHeight(true, isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes) |
| + + scrollbarLogicalHeight(); |
| + if (size().height() < minHeight) |
| + setLogicalHeight(minHeight); |
| + } |
|
rune
2015/02/25 11:34:53
This code is identical to the code in RenderFlexib
|
| } |
| void RenderGrid::layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior info) |