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..d15ad51414803d8f649c4ae907e3c9e06f688c36 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 (cb->styleRef().logicalHeight().isAuto() && cb->hasOverrideContainingBlockLogicalHeight()) { |
jfernandez
2016/06/06 15:15:54
Nit: better using cbstyle ?
If we are computing
Manuel Rego
2016/06/06 15:55:46
Sure, done.
jfernandez
2016/06/06 16:18:04
why not moving the new branch after the one checki
Manuel Rego
2016/06/06 16:39:59
I can move it but I still need the isAuto() check.
jfernandez
2016/06/06 17:45:49
Yeah, there is a case for the percentage cases bel
|
+ availableHeight = cb->overrideContainingBlockContentLogicalHeight(); |
} else if (cbstyle.logicalHeight().isFixed()) { |
LayoutUnit contentBoxHeight = cb->adjustContentBoxLogicalHeightForBoxSizing(cbstyle.logicalHeight().value()); |
availableHeight = cb->constrainContentBoxLogicalHeightByMinMax( |