mozilla-central: changeset 304165:83d9f275922858c133c957249bd415862f397f0b

author	Xidorn Quan <me@upsuper.org>
	Thu, 07 Jul 2016 16:48:21 +1000
changeset 304165	83d9f275922858c133c957249bd415862f397f0b
parent 304164	90e2eea25b34af97d380094143f8c4bd421dc223
child 304166	e0711b79a474e3bdb3809cdbea14761ebcd94dee
push id	30414
push user	cbook@mozilla.com
push date	Fri, 08 Jul 2016 09:59:01 +0000
treeherder	mozilla-central@45682df2d2d4 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jfkthame
bugs	1283721
milestone	50.0a1
first release with	nightly linux32 45682df2d2d4 / 50.0a1 / 20160708030216 / files nightly linux64 45682df2d2d4 / 50.0a1 / 20160708030216 / files nightly mac 45682df2d2d4 / 50.0a1 / 20160708030216 / files nightly win32 45682df2d2d4 / 50.0a1 / 20160708030216 / files nightly win64 45682df2d2d4 / 50.0a1 / 20160708030216 / files
last release without	nightly linux32 63cc31d6cc1c / 50.0a1 / 20160707083343 / files nightly linux64 63cc31d6cc1c / 50.0a1 / 20160707083343 / files nightly mac 63cc31d6cc1c / 50.0a1 / 20160707083343 / files nightly win32 63cc31d6cc1c / 50.0a1 / 20160707083343 / files nightly win64 63cc31d6cc1c / 50.0a1 / 20160707083343 / files

--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -3399,17 +3399,17 @@ nsBlockFrame::ReflowBlockFrame(nsBlockRe
       // reflow again.
       if (!replacedBlock) {
         break;
       }
 
       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),
                    "yikes");
       // Restore the height to the position of the next band.
       floatAvailableSpace.mRect.BSize(wm) =
         oldFloatAvailableSpaceRect.BSize(wm);
       // Determine whether the available space shrunk on either side,