From 3381e78769df3e44b87bda6e7b763e143d1283ec Mon Sep 17 00:00:00 2001 From: Jonathan Kew Date: Mon, 27 Apr 2015 09:41:37 +0100 Subject: [PATCH] Bug 1158549 - Properly apply min/max constraints to block-size in vertical writing modes. r=smontagu --- layout/generic/nsBlockFrame.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 47d7e3ab7d3e..cd059aba8811 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -1557,9 +1557,9 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState, } else if (NS_FRAME_IS_COMPLETE(aState.mReflowStatus)) { nscoord contentBSize = blockEndEdgeOfChildren - borderPadding.BStart(wm); - nscoord autoBSize = aReflowState.ApplyMinMaxHeight(contentBSize); + nscoord autoBSize = aReflowState.ApplyMinMaxBSize(contentBSize); if (autoBSize != contentBSize) { - // Our min-height or max-height made our height change. Don't carry out + // Our min- or max-bsize value made our bsize change. Don't carry out // our kids' block-end margins. aMetrics.mCarriedOutBEndMargin.Zero(); }