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 1cbedcad8db3996a92f175d35cad6c5aeda90a76..f8e9a8038a8249dea3f6e8b4642b0200f7588c4d 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp |
@@ -2733,6 +2733,8 @@ LayoutUnit LayoutBox::computePercentageLogicalHeight(const Length& height) const |
availableHeight = stretchedFlexHeight; |
} else if (hasOverrideContainingBlockLogicalHeight()) { |
availableHeight = overrideContainingBlockContentLogicalHeight(); |
+ } else if (cbstyle.logicalHeight().isAuto() && cb->hasOverrideContainingBlockLogicalHeight()) { |
cbiesinger1
2016/06/06 16:56:57
This does not seem correct in general. You are now
Manuel Rego
2016/06/06 19:24:09
overrideContainingBlockLogicalHeight is only used
|
+ availableHeight = cb->overrideContainingBlockContentLogicalHeight(); |
} else if (cbstyle.logicalHeight().isFixed()) { |
LayoutUnit contentBoxHeight = cb->adjustContentBoxLogicalHeightForBoxSizing(cbstyle.logicalHeight().value()); |
availableHeight = cb->constrainContentBoxLogicalHeightByMinMax( |