Index: Source/core/rendering/RenderBoxModelObject.cpp |
diff --git a/Source/core/rendering/RenderBoxModelObject.cpp b/Source/core/rendering/RenderBoxModelObject.cpp |
index 841d94f5d8d45e56fdb3652567f1880f2d9965df..1ab612b2c27e55a08defbf769b064609a4329e48 100644 |
--- a/Source/core/rendering/RenderBoxModelObject.cpp |
+++ b/Source/core/rendering/RenderBoxModelObject.cpp |
@@ -190,7 +190,11 @@ bool RenderBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight() const |
if (cb->isRenderView()) |
return false; |
- if (!cb->style()->logicalHeight().isAuto() || (!cb->style()->logicalTop().isAuto() && !cb->style()->logicalBottom().isAuto())) |
+ if (!cb->style()->logicalTop().isAuto() && !cb->style()->logicalBottom().isAuto()) |
davve
2014/06/30 08:52:37
This line still looks suspect. I filed https://cod
|
+ 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; |