From 0cc7aadbc13b0fcdc5eab1005cc8bc11cb12041f Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Thu, 5 Aug 2010 21:59:20 -0700
Subject: [PATCH] Don't split floats when we're not paginating.  (Bug 563584,
 patch 26)  Fixes assertion on layout/generic/crashtests/461294-1.html . 
 r=roc

---
 layout/generic/nsBlockReflowState.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp
index ba7c00c89ab..a9145b8e3f7 100644
--- a/layout/generic/nsBlockReflowState.cpp
+++ b/layout/generic/nsBlockReflowState.cpp
@@ -716,7 +716,8 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
   PRBool keepFloatOnSameLine = PR_FALSE;
 
   for (;;) {
-    if (floatAvailableSpace.mRect.height <= 0) {
+    if (mReflowState.availableHeight != NS_UNCONSTRAINEDSIZE &&
+        floatAvailableSpace.mRect.height <= 0) {
       // No space, nowhere to put anything.
       PushFloatPastBreak(aFloat);
       return PR_FALSE;