| Index: Source/core/rendering/RenderBoxModelObject.cpp
|
| diff --git a/Source/core/rendering/RenderBoxModelObject.cpp b/Source/core/rendering/RenderBoxModelObject.cpp
|
| index 233497736ab23155dcee87c38b9241308a8dc723..dcfe8878b9350f9e2099256d0429a97b7e369376 100644
|
| --- a/Source/core/rendering/RenderBoxModelObject.cpp
|
| +++ b/Source/core/rendering/RenderBoxModelObject.cpp
|
| @@ -191,14 +191,11 @@ bool RenderBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight() const
|
| if (cb->isRenderView())
|
| return false;
|
|
|
| - if (!cb->style()->logicalTop().isAuto() && !cb->style()->logicalBottom().isAuto())
|
| + if (cb->isOutOfFlowPositioned() && !cb->style()->logicalTop().isAuto() && !cb->style()->logicalBottom().isAuto())
|
| return false;
|
|
|
| - // If the height of the containing block computes to 'auto', then it hasn't been 'specified explictly'.
|
| - if (!cb->hasAutoHeightOrContainingBlockWithAutoHeight())
|
| - return false;
|
| -
|
| - return true;
|
| + // If the height of the containing block computes to 'auto', then it hasn't been 'specified explicitly'.
|
| + return cb->hasAutoHeightOrContainingBlockWithAutoHeight();
|
| }
|
|
|
| LayoutSize RenderBoxModelObject::relativePositionOffset() const
|
|
|