Don't split floats when we're not paginating. (Bug 563584, patch 26) Fixes assertion on layout/generic/crashtests/461294-1.html . r=roc

This commit is contained in:
L. David Baron 2010-08-05 21:59:20 -07:00
parent 0d14c6f6b1
commit b479bd2afc

View File

@ -716,7 +716,8 @@ nsBlockReflowState::FlowAndPlaceFloat(nsIFrame* aFloat)
PRBool keepFloatOnSameLine = PR_FALSE; PRBool keepFloatOnSameLine = PR_FALSE;
for (;;) { for (;;) {
if (floatAvailableSpace.mRect.height <= 0) { if (mReflowState.availableHeight != NS_UNCONSTRAINEDSIZE &&
floatAvailableSpace.mRect.height <= 0) {
// No space, nowhere to put anything. // No space, nowhere to put anything.
PushFloatPastBreak(aFloat); PushFloatPastBreak(aFloat);
return PR_FALSE; return PR_FALSE;