| 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 2e97d44dcba9ef9b90264fc03e65c9ad4c167e3a..9137ecf1dc9429612d281307f6f2dbf45e1b35a7 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| @@ -2731,7 +2731,7 @@ LayoutUnit LayoutBox::computePercentageLogicalHeight(const Length& height) const
|
| availableHeight = containingBlockChild->containingBlockLogicalWidthForContent();
|
| } else if (stretchedFlexHeight != LayoutUnit(-1)) {
|
| availableHeight = stretchedFlexHeight;
|
| - } else if (hasOverrideContainingBlockLogicalHeight()) {
|
| + } else if (hasOverrideContainingBlockLogicalHeight() && !isOutOfFlowPositionedWithSpecifiedHeight) {
|
| availableHeight = overrideContainingBlockContentLogicalHeight();
|
| } else if (cbstyle.logicalHeight().isFixed()) {
|
| LayoutUnit contentBoxHeight = cb->adjustContentBoxLogicalHeightForBoxSizing(cbstyle.logicalHeight().value());
|
|
|