From 79c420f15ba3e69e444b976cfa8176061677aaec Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 16 Oct 2012 10:52:55 -0400 Subject: [PATCH] Bug 801116 followup: clearer variable naming. DONTBUILD --- layout/base/nsLayoutUtils.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 1ca20dcd0832..d6b51c604287 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -2592,19 +2592,19 @@ nsLayoutUtils::IntrinsicForContainer(nsRenderingContext *aRenderingContext, if (GetAbsoluteCoord(styleMaxHeight, h) || GetPercentHeight(styleMaxHeight, aFrame, h)) { h = NS_MAX(0, h - heightTakenByBoxSizing); - nscoord maxHeight = + nscoord maxWidth = NSToCoordRound(h * (float(ratio.width) / float(ratio.height))); - if (maxHeight < result) - result = maxHeight; + if (maxWidth < result) + result = maxWidth; } if (GetAbsoluteCoord(styleMinHeight, h) || GetPercentHeight(styleMinHeight, aFrame, h)) { h = NS_MAX(0, h - heightTakenByBoxSizing); - nscoord minHeight = + nscoord minWidth = NSToCoordRound(h * (float(ratio.width) / float(ratio.height))); - if (minHeight > result) - result = minHeight; + if (minWidth > result) + result = minWidth; } } }