Index: Source/core/rendering/RenderBox.cpp |
diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp |
index eecb1465fd5aa3fddb8b385e56e86933d904cd96..b2f0aab5bbcee0264722eb7414a679928411c188 100644 |
--- a/Source/core/rendering/RenderBox.cpp |
+++ b/Source/core/rendering/RenderBox.cpp |
@@ -2673,6 +2673,8 @@ LayoutUnit RenderBox::computePercentageLogicalHeight(const Length& height) const |
availableHeight = containingBlockChild->containingBlockLogicalWidthForContent(); |
else if (hasOverrideContainingBlockLogicalHeight()) |
availableHeight = overrideContainingBlockContentLogicalHeight(); |
+ else if (cb->isFlexItem() && cb->hasOverrideContainingBlockLogicalHeight()) |
+ availableHeight = cb->overrideContainingBlockContentLogicalHeight(); |
else if (cb->isTableCell()) { |
if (!skippedAutoHeightContainingBlock) { |
// Table cells violate what the CSS spec says to do with heights. Basically we |