Index: Source/core/rendering/RenderBox.cpp |
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp |
index e794b2e24f63c6c052431c0157dfe28efe4b2ed0..adb3cb124cc5edd08a5924f05d88c3208a9ac45f 100644 |
--- a/Source/core/rendering/RenderBox.cpp |
+++ b/Source/core/rendering/RenderBox.cpp |
@@ -2169,7 +2169,7 @@ void RenderBox::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logica |
// grab our cached flexible height. |
// FIXME: Account for block-flow in flexible boxes. |
// https://bugs.webkit.org/show_bug.cgi?id=46418 |
- if (hasOverrideHeight() && parent()->isFlexibleBoxIncludingDeprecated()) |
+ if (hasOverrideHeight() && (parent()->isFlexibleBoxIncludingDeprecated() || parent()->isRenderGrid())) |
h = Length(overrideLogicalContentHeight(), Fixed); |
else if (treatAsReplaced) |
h = Length(computeReplacedLogicalHeight(), Fixed); |