Upstream version 10.38.220.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / rendering / RenderBoxModelObject.cpp

diff --git a/src/third_party/WebKit/Source/core/rendering/RenderBoxModelObject.cpp b/src/third_party/WebKit/Source/core/rendering/RenderBoxModelObject.cpp
index b06ed1d..eb6e04c 100644 (file)
--- a/src/third_party/WebKit/Source/core/rendering/RenderBoxModelObject.cpp
+++ b/src/third_party/WebKit/Source/core/rendering/RenderBoxModelObject.cpp
@@ -193,11 +193,10 @@ bool RenderBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight() const
     if (cb->isRenderView())
         return false;
 
-    if (cb->isOutOfFlowPositioned() && !cb->style()->logicalTop().isAuto() && !cb->style()->logicalBottom().isAuto())
+    if (!cb->style()->logicalHeight().isAuto() || (!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 explicitly'.
-    return cb->hasAutoHeightOrContainingBlockWithAutoHeight();
+    return true;
 }
 
 LayoutSize RenderBoxModelObject::relativePositionOffset() const