Index: Source/core/layout/LayoutGrid.cpp |
diff --git a/Source/core/layout/LayoutGrid.cpp b/Source/core/layout/LayoutGrid.cpp |
index 11d580dec5ceb9a71ce0bda5db20318228fc28cb..1a4b7e4c27419a4032105e776454e65ef6ef184e 100644 |
--- a/Source/core/layout/LayoutGrid.cpp |
+++ b/Source/core/layout/LayoutGrid.cpp |
@@ -1162,9 +1162,12 @@ void LayoutGrid::layoutGridItems() |
for (const auto& row : sizingData.rowTracks) |
setLogicalHeight(logicalHeight() + row.baseSize()); |
- // Min / max logical height is handled by the call to updateLogicalHeight in layoutBlock. |
+ LayoutUnit height = logicalHeight() + borderAndPaddingLogicalHeight(); |
+ if (hasLineIfEmpty()) |
+ height = std::max(height, minimumLogicalHeightForEmptyLine()); |
- setLogicalHeight(logicalHeight() + borderAndPaddingLogicalHeight()); |
+ // Min / max logical height is handled by the call to updateLogicalHeight in layoutBlock. |
+ setLogicalHeight(height); |
} |
void LayoutGrid::layoutPositionedObjects(bool relayoutChildren, PositionedLayoutBehavior info) |