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

Unified Diff: Source/WebCore/rendering/RenderReplaced.cpp

Issue 13674002: Support intrinsic values for height, min-height and max-height (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: better fixme comment Created 7 years, 8 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
Index: Source/WebCore/rendering/RenderReplaced.cpp
diff --git a/Source/WebCore/rendering/RenderReplaced.cpp b/Source/WebCore/rendering/RenderReplaced.cpp
index 39664b5c11de425147c44f0c8cf10f6cc9ed11d5..d300929c32137a6f4878cdf224a18c2650324748 100644
--- a/Source/WebCore/rendering/RenderReplaced.cpp
+++ b/Source/WebCore/rendering/RenderReplaced.cpp
@@ -388,8 +388,10 @@ LayoutUnit RenderReplaced::computeReplacedLogicalWidth(ShouldComputePreferred sh
LayoutUnit RenderReplaced::computeReplacedLogicalHeight() const
{
// 10.5 Content height: the 'height' property: http://www.w3.org/TR/CSS21/visudet.html#propdef-height
- if (hasReplacedLogicalHeight())
- return computeReplacedLogicalHeightRespectingMinMaxHeight(computeReplacedLogicalHeightUsing(style()->logicalHeight()));
+ if (hasReplacedLogicalHeight()) {
ojan 2013/04/11 03:21:46 It doesn't look like you changed anything here...a
cbiesinger 2013/04/12 01:17:52 Leftover from some debugging, I think. Reverted.
+ LayoutUnit height = computeReplacedLogicalHeightUsing(style()->logicalHeight());
+ return computeReplacedLogicalHeightRespectingMinMaxHeight(height);
+ }
RenderBox* contentRenderer = embeddedContentBox();
« Source/WebCore/rendering/RenderGrid.cpp ('K') | « Source/WebCore/rendering/RenderGrid.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698