Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1059)

Unified Diff: Source/core/rendering/RenderBoxModelObject.cpp

Issue 347053007: Ensure we compute the height of replaced elements to 'auto' when appropriate. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/css2.1/20110323/support/black96x96.png ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « LayoutTests/css2.1/20110323/support/black96x96.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698