From a3fdca80b5d9a2d0c334d5c402e1e6e188a5a841 Mon Sep 17 00:00:00 2001
From: Xidorn Quan <me@upsuper.org>
Date: Thu, 7 Jul 2016 16:48:21 +1000
Subject: [PATCH] Bug 1283721 - Use block-size rather than height for computing
 float available space. r=jfkthame

MozReview-Commit-ID: HyGmoYJDOkd

--HG--
extra : transplant_source : %21G%83%7B%8E%B5%26%3EW%F41%23dBD%8F%3A%9D%1DM
---
 layout/generic/nsBlockFrame.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
index 3fc1cc56c6b5..c692c2650950 100644
--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -3404,7 +3404,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
       LogicalRect oldFloatAvailableSpaceRect(floatAvailableSpace.mRect);
       floatAvailableSpace = aState.GetFloatAvailableSpaceForBSize(
                               aState.mBCoord + bStartMargin,
-                              brc.GetMetrics().Height(),
+                              brc.GetMetrics().BSize(wm),
                               &floatManagerState);
       NS_ASSERTION(floatAvailableSpace.mRect.BStart(wm) ==
                      oldFloatAvailableSpaceRect.BStart(wm),