Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
index 029dc87cb0061da14eebfd899328920155248c89..4a51e697ace3d6acff949ed32c58217422ca0800 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
@@ -2362,7 +2362,7 @@ void LayoutBox::computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logica |
// grab our cached flexible height. |
// FIXME: Account for writing-mode in flexible boxes. |
// https://bugs.webkit.org/show_bug.cgi?id=46418 |
- if (hasOverrideLogicalContentHeight() && (parent()->isFlexibleBoxIncludingDeprecated() || parent()->isLayoutGrid())) { |
+ if (hasOverrideLogicalContentHeight()) { |
LayoutUnit contentHeight = overrideLogicalContentHeight(); |
if (parent()->isLayoutGrid() && style()->logicalMinHeight().isAuto() && style()->overflowY() == OVISIBLE) { |
ASSERT(style()->logicalHeight().isAuto()); |