From b1972b0b4278bb515cce786f53878100e1f20318 Mon Sep 17 00:00:00 2001
From: "kipp%netscape.com"
 <kipp%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 18 Sep 1999 00:20:48 +0000
Subject: [PATCH] Handle right aligned skipped floaters a little better

git-svn-id: svn://10.0.0.236/trunk@48112 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/generic/nsBlockFrame.cpp       | 39 ++++++++++++++++---
 mozilla/layout/generic/nsBlockReflowState.cpp | 39 ++++++++++++++++---
 mozilla/layout/generic/nsBlockReflowState.h   | 39 ++++++++++++++++---
 mozilla/layout/html/base/src/nsBlockFrame.cpp | 39 ++++++++++++++++---
 .../html/base/src/nsBlockReflowState.cpp      | 39 ++++++++++++++++---
 .../layout/html/base/src/nsBlockReflowState.h | 39 ++++++++++++++++---
 6 files changed, 204 insertions(+), 30 deletions(-)

diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 95c5a39d5ec..ce73c0be285 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -361,6 +361,9 @@ public:
 
   PRBool mUnconstrainedHeight;
 
+  PRBool mSkippedRightFloaters;
+  nsSize mSkippedMaxElementSize;
+
   // The content area to reflow child frames within. The x/y
   // coordinates are known to be mBorderPadding.left and
   // mBorderPadding.top. The width/height may be NS_UNCONSTRAINEDSIZE
@@ -507,6 +510,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
       mContentArea.width = aReflowState.availableWidth - lr;
     }
   }
+  mSkippedRightFloaters = PR_FALSE;
+  mSkippedMaxElementSize.SizeTo(0, 0);
 
   // Compute content area height. Unlike the width, if we have a
   // specified style height we ignore it since extra content is
@@ -1573,15 +1578,19 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
       (((0 == aState.mKidXMost) ||
         (0 == aState.mKidXMost - borderPadding.left)) &&
        (0 == aState.mY - borderPadding.top))) {
-    // Zero out the works
+    // Zero out most everything
     aMetrics.width = 0;
     aMetrics.height = 0;
     aMetrics.ascent = 0;
     aMetrics.descent = 0;
     aMetrics.mCarriedOutBottomMargin = 0;
+
+    // Note: Don't zero out the max-element-sizes: they will be zero
+    // if this is truly empty, otherwise they won't because of a
+    // floater.
     if (nsnull != aMetrics.maxElementSize) {
-      aMetrics.maxElementSize->width = 0;
-      aMetrics.maxElementSize->height = 0;
+      aMetrics.maxElementSize->width = aState.mMaxElementSize.width;
+      aMetrics.maxElementSize->height = aState.mMaxElementSize.height;
     }
   }
   else {
@@ -3743,14 +3752,26 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
       printf("PASS1 ");
     }
     ListTag(stdout);
-    printf(": line.floaters=%d band.floaterCount=%d\n",
-           aLine->mFloaters ? aLine->mFloaters->Count() : -1,
+    printf(": line.floaters=%s band.floaterCount=%d\n",
+           aLine->mFloaters.NotEmpty() ? "yes" : "no",
            aState.mBand.GetFloaterCount());
 #endif
     if (0 != aState.mBand.GetFloaterCount()) {
       // Add in floater impacts to the lines max-element-size
       ComputeLineMaxElementSize(aState, aLine, &maxElementSize);
     }
+
+    // Factor in any skipped right floaters...
+    if (aState.mSkippedRightFloaters) {
+      if (aState.mSkippedMaxElementSize.width > maxElementSize.width) {
+        maxElementSize.width = aState.mSkippedMaxElementSize.width;
+      }
+      if (aState.mSkippedMaxElementSize.height > maxElementSize.height) {
+        maxElementSize.height = aState.mSkippedMaxElementSize.height;
+      }
+      aState.mSkippedMaxElementSize.SizeTo(0, 0);
+      aState.mSkippedRightFloaters = PR_FALSE;
+    }
   }
   PostPlaceLine(aState, aLine, maxElementSize);
 
@@ -5117,6 +5138,14 @@ nsBlockReflowState::PlaceFloater(nsFloaterCache* aFloaterCache,
       // pretend that the floater ended up at the left margin...
       okToAddRectRegion = PR_FALSE;
       region.x = mAvailSpaceRect.x;
+      mSkippedRightFloaters = PR_TRUE;
+      if (region.width > mSkippedMaxElementSize.width) {
+        mSkippedMaxElementSize.width = region.width;
+      }
+      if (region.height > mSkippedMaxElementSize.height) {
+        mSkippedMaxElementSize.height = region.height;
+      }
+//      region.x = mAvailSpaceRect.XMost() - region.width;
     }
     else {
       region.x = mAvailSpaceRect.XMost() - region.width;
diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp
index 95c5a39d5ec..ce73c0be285 100644
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/layout/generic/nsBlockReflowState.cpp
@@ -361,6 +361,9 @@ public:
 
   PRBool mUnconstrainedHeight;
 
+  PRBool mSkippedRightFloaters;
+  nsSize mSkippedMaxElementSize;
+
   // The content area to reflow child frames within. The x/y
   // coordinates are known to be mBorderPadding.left and
   // mBorderPadding.top. The width/height may be NS_UNCONSTRAINEDSIZE
@@ -507,6 +510,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
       mContentArea.width = aReflowState.availableWidth - lr;
     }
   }
+  mSkippedRightFloaters = PR_FALSE;
+  mSkippedMaxElementSize.SizeTo(0, 0);
 
   // Compute content area height. Unlike the width, if we have a
   // specified style height we ignore it since extra content is
@@ -1573,15 +1578,19 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
       (((0 == aState.mKidXMost) ||
         (0 == aState.mKidXMost - borderPadding.left)) &&
        (0 == aState.mY - borderPadding.top))) {
-    // Zero out the works
+    // Zero out most everything
     aMetrics.width = 0;
     aMetrics.height = 0;
     aMetrics.ascent = 0;
     aMetrics.descent = 0;
     aMetrics.mCarriedOutBottomMargin = 0;
+
+    // Note: Don't zero out the max-element-sizes: they will be zero
+    // if this is truly empty, otherwise they won't because of a
+    // floater.
     if (nsnull != aMetrics.maxElementSize) {
-      aMetrics.maxElementSize->width = 0;
-      aMetrics.maxElementSize->height = 0;
+      aMetrics.maxElementSize->width = aState.mMaxElementSize.width;
+      aMetrics.maxElementSize->height = aState.mMaxElementSize.height;
     }
   }
   else {
@@ -3743,14 +3752,26 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
       printf("PASS1 ");
     }
     ListTag(stdout);
-    printf(": line.floaters=%d band.floaterCount=%d\n",
-           aLine->mFloaters ? aLine->mFloaters->Count() : -1,
+    printf(": line.floaters=%s band.floaterCount=%d\n",
+           aLine->mFloaters.NotEmpty() ? "yes" : "no",
            aState.mBand.GetFloaterCount());
 #endif
     if (0 != aState.mBand.GetFloaterCount()) {
       // Add in floater impacts to the lines max-element-size
       ComputeLineMaxElementSize(aState, aLine, &maxElementSize);
     }
+
+    // Factor in any skipped right floaters...
+    if (aState.mSkippedRightFloaters) {
+      if (aState.mSkippedMaxElementSize.width > maxElementSize.width) {
+        maxElementSize.width = aState.mSkippedMaxElementSize.width;
+      }
+      if (aState.mSkippedMaxElementSize.height > maxElementSize.height) {
+        maxElementSize.height = aState.mSkippedMaxElementSize.height;
+      }
+      aState.mSkippedMaxElementSize.SizeTo(0, 0);
+      aState.mSkippedRightFloaters = PR_FALSE;
+    }
   }
   PostPlaceLine(aState, aLine, maxElementSize);
 
@@ -5117,6 +5138,14 @@ nsBlockReflowState::PlaceFloater(nsFloaterCache* aFloaterCache,
       // pretend that the floater ended up at the left margin...
       okToAddRectRegion = PR_FALSE;
       region.x = mAvailSpaceRect.x;
+      mSkippedRightFloaters = PR_TRUE;
+      if (region.width > mSkippedMaxElementSize.width) {
+        mSkippedMaxElementSize.width = region.width;
+      }
+      if (region.height > mSkippedMaxElementSize.height) {
+        mSkippedMaxElementSize.height = region.height;
+      }
+//      region.x = mAvailSpaceRect.XMost() - region.width;
     }
     else {
       region.x = mAvailSpaceRect.XMost() - region.width;
diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h
index 95c5a39d5ec..ce73c0be285 100644
--- a/mozilla/layout/generic/nsBlockReflowState.h
+++ b/mozilla/layout/generic/nsBlockReflowState.h
@@ -361,6 +361,9 @@ public:
 
   PRBool mUnconstrainedHeight;
 
+  PRBool mSkippedRightFloaters;
+  nsSize mSkippedMaxElementSize;
+
   // The content area to reflow child frames within. The x/y
   // coordinates are known to be mBorderPadding.left and
   // mBorderPadding.top. The width/height may be NS_UNCONSTRAINEDSIZE
@@ -507,6 +510,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
       mContentArea.width = aReflowState.availableWidth - lr;
     }
   }
+  mSkippedRightFloaters = PR_FALSE;
+  mSkippedMaxElementSize.SizeTo(0, 0);
 
   // Compute content area height. Unlike the width, if we have a
   // specified style height we ignore it since extra content is
@@ -1573,15 +1578,19 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
       (((0 == aState.mKidXMost) ||
         (0 == aState.mKidXMost - borderPadding.left)) &&
        (0 == aState.mY - borderPadding.top))) {
-    // Zero out the works
+    // Zero out most everything
     aMetrics.width = 0;
     aMetrics.height = 0;
     aMetrics.ascent = 0;
     aMetrics.descent = 0;
     aMetrics.mCarriedOutBottomMargin = 0;
+
+    // Note: Don't zero out the max-element-sizes: they will be zero
+    // if this is truly empty, otherwise they won't because of a
+    // floater.
     if (nsnull != aMetrics.maxElementSize) {
-      aMetrics.maxElementSize->width = 0;
-      aMetrics.maxElementSize->height = 0;
+      aMetrics.maxElementSize->width = aState.mMaxElementSize.width;
+      aMetrics.maxElementSize->height = aState.mMaxElementSize.height;
     }
   }
   else {
@@ -3743,14 +3752,26 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
       printf("PASS1 ");
     }
     ListTag(stdout);
-    printf(": line.floaters=%d band.floaterCount=%d\n",
-           aLine->mFloaters ? aLine->mFloaters->Count() : -1,
+    printf(": line.floaters=%s band.floaterCount=%d\n",
+           aLine->mFloaters.NotEmpty() ? "yes" : "no",
            aState.mBand.GetFloaterCount());
 #endif
     if (0 != aState.mBand.GetFloaterCount()) {
       // Add in floater impacts to the lines max-element-size
       ComputeLineMaxElementSize(aState, aLine, &maxElementSize);
     }
+
+    // Factor in any skipped right floaters...
+    if (aState.mSkippedRightFloaters) {
+      if (aState.mSkippedMaxElementSize.width > maxElementSize.width) {
+        maxElementSize.width = aState.mSkippedMaxElementSize.width;
+      }
+      if (aState.mSkippedMaxElementSize.height > maxElementSize.height) {
+        maxElementSize.height = aState.mSkippedMaxElementSize.height;
+      }
+      aState.mSkippedMaxElementSize.SizeTo(0, 0);
+      aState.mSkippedRightFloaters = PR_FALSE;
+    }
   }
   PostPlaceLine(aState, aLine, maxElementSize);
 
@@ -5117,6 +5138,14 @@ nsBlockReflowState::PlaceFloater(nsFloaterCache* aFloaterCache,
       // pretend that the floater ended up at the left margin...
       okToAddRectRegion = PR_FALSE;
       region.x = mAvailSpaceRect.x;
+      mSkippedRightFloaters = PR_TRUE;
+      if (region.width > mSkippedMaxElementSize.width) {
+        mSkippedMaxElementSize.width = region.width;
+      }
+      if (region.height > mSkippedMaxElementSize.height) {
+        mSkippedMaxElementSize.height = region.height;
+      }
+//      region.x = mAvailSpaceRect.XMost() - region.width;
     }
     else {
       region.x = mAvailSpaceRect.XMost() - region.width;
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index 95c5a39d5ec..ce73c0be285 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -361,6 +361,9 @@ public:
 
   PRBool mUnconstrainedHeight;
 
+  PRBool mSkippedRightFloaters;
+  nsSize mSkippedMaxElementSize;
+
   // The content area to reflow child frames within. The x/y
   // coordinates are known to be mBorderPadding.left and
   // mBorderPadding.top. The width/height may be NS_UNCONSTRAINEDSIZE
@@ -507,6 +510,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
       mContentArea.width = aReflowState.availableWidth - lr;
     }
   }
+  mSkippedRightFloaters = PR_FALSE;
+  mSkippedMaxElementSize.SizeTo(0, 0);
 
   // Compute content area height. Unlike the width, if we have a
   // specified style height we ignore it since extra content is
@@ -1573,15 +1578,19 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
       (((0 == aState.mKidXMost) ||
         (0 == aState.mKidXMost - borderPadding.left)) &&
        (0 == aState.mY - borderPadding.top))) {
-    // Zero out the works
+    // Zero out most everything
     aMetrics.width = 0;
     aMetrics.height = 0;
     aMetrics.ascent = 0;
     aMetrics.descent = 0;
     aMetrics.mCarriedOutBottomMargin = 0;
+
+    // Note: Don't zero out the max-element-sizes: they will be zero
+    // if this is truly empty, otherwise they won't because of a
+    // floater.
     if (nsnull != aMetrics.maxElementSize) {
-      aMetrics.maxElementSize->width = 0;
-      aMetrics.maxElementSize->height = 0;
+      aMetrics.maxElementSize->width = aState.mMaxElementSize.width;
+      aMetrics.maxElementSize->height = aState.mMaxElementSize.height;
     }
   }
   else {
@@ -3743,14 +3752,26 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
       printf("PASS1 ");
     }
     ListTag(stdout);
-    printf(": line.floaters=%d band.floaterCount=%d\n",
-           aLine->mFloaters ? aLine->mFloaters->Count() : -1,
+    printf(": line.floaters=%s band.floaterCount=%d\n",
+           aLine->mFloaters.NotEmpty() ? "yes" : "no",
            aState.mBand.GetFloaterCount());
 #endif
     if (0 != aState.mBand.GetFloaterCount()) {
       // Add in floater impacts to the lines max-element-size
       ComputeLineMaxElementSize(aState, aLine, &maxElementSize);
     }
+
+    // Factor in any skipped right floaters...
+    if (aState.mSkippedRightFloaters) {
+      if (aState.mSkippedMaxElementSize.width > maxElementSize.width) {
+        maxElementSize.width = aState.mSkippedMaxElementSize.width;
+      }
+      if (aState.mSkippedMaxElementSize.height > maxElementSize.height) {
+        maxElementSize.height = aState.mSkippedMaxElementSize.height;
+      }
+      aState.mSkippedMaxElementSize.SizeTo(0, 0);
+      aState.mSkippedRightFloaters = PR_FALSE;
+    }
   }
   PostPlaceLine(aState, aLine, maxElementSize);
 
@@ -5117,6 +5138,14 @@ nsBlockReflowState::PlaceFloater(nsFloaterCache* aFloaterCache,
       // pretend that the floater ended up at the left margin...
       okToAddRectRegion = PR_FALSE;
       region.x = mAvailSpaceRect.x;
+      mSkippedRightFloaters = PR_TRUE;
+      if (region.width > mSkippedMaxElementSize.width) {
+        mSkippedMaxElementSize.width = region.width;
+      }
+      if (region.height > mSkippedMaxElementSize.height) {
+        mSkippedMaxElementSize.height = region.height;
+      }
+//      region.x = mAvailSpaceRect.XMost() - region.width;
     }
     else {
       region.x = mAvailSpaceRect.XMost() - region.width;
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
index 95c5a39d5ec..ce73c0be285 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
@@ -361,6 +361,9 @@ public:
 
   PRBool mUnconstrainedHeight;
 
+  PRBool mSkippedRightFloaters;
+  nsSize mSkippedMaxElementSize;
+
   // The content area to reflow child frames within. The x/y
   // coordinates are known to be mBorderPadding.left and
   // mBorderPadding.top. The width/height may be NS_UNCONSTRAINEDSIZE
@@ -507,6 +510,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
       mContentArea.width = aReflowState.availableWidth - lr;
     }
   }
+  mSkippedRightFloaters = PR_FALSE;
+  mSkippedMaxElementSize.SizeTo(0, 0);
 
   // Compute content area height. Unlike the width, if we have a
   // specified style height we ignore it since extra content is
@@ -1573,15 +1578,19 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
       (((0 == aState.mKidXMost) ||
         (0 == aState.mKidXMost - borderPadding.left)) &&
        (0 == aState.mY - borderPadding.top))) {
-    // Zero out the works
+    // Zero out most everything
     aMetrics.width = 0;
     aMetrics.height = 0;
     aMetrics.ascent = 0;
     aMetrics.descent = 0;
     aMetrics.mCarriedOutBottomMargin = 0;
+
+    // Note: Don't zero out the max-element-sizes: they will be zero
+    // if this is truly empty, otherwise they won't because of a
+    // floater.
     if (nsnull != aMetrics.maxElementSize) {
-      aMetrics.maxElementSize->width = 0;
-      aMetrics.maxElementSize->height = 0;
+      aMetrics.maxElementSize->width = aState.mMaxElementSize.width;
+      aMetrics.maxElementSize->height = aState.mMaxElementSize.height;
     }
   }
   else {
@@ -3743,14 +3752,26 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
       printf("PASS1 ");
     }
     ListTag(stdout);
-    printf(": line.floaters=%d band.floaterCount=%d\n",
-           aLine->mFloaters ? aLine->mFloaters->Count() : -1,
+    printf(": line.floaters=%s band.floaterCount=%d\n",
+           aLine->mFloaters.NotEmpty() ? "yes" : "no",
            aState.mBand.GetFloaterCount());
 #endif
     if (0 != aState.mBand.GetFloaterCount()) {
       // Add in floater impacts to the lines max-element-size
       ComputeLineMaxElementSize(aState, aLine, &maxElementSize);
     }
+
+    // Factor in any skipped right floaters...
+    if (aState.mSkippedRightFloaters) {
+      if (aState.mSkippedMaxElementSize.width > maxElementSize.width) {
+        maxElementSize.width = aState.mSkippedMaxElementSize.width;
+      }
+      if (aState.mSkippedMaxElementSize.height > maxElementSize.height) {
+        maxElementSize.height = aState.mSkippedMaxElementSize.height;
+      }
+      aState.mSkippedMaxElementSize.SizeTo(0, 0);
+      aState.mSkippedRightFloaters = PR_FALSE;
+    }
   }
   PostPlaceLine(aState, aLine, maxElementSize);
 
@@ -5117,6 +5138,14 @@ nsBlockReflowState::PlaceFloater(nsFloaterCache* aFloaterCache,
       // pretend that the floater ended up at the left margin...
       okToAddRectRegion = PR_FALSE;
       region.x = mAvailSpaceRect.x;
+      mSkippedRightFloaters = PR_TRUE;
+      if (region.width > mSkippedMaxElementSize.width) {
+        mSkippedMaxElementSize.width = region.width;
+      }
+      if (region.height > mSkippedMaxElementSize.height) {
+        mSkippedMaxElementSize.height = region.height;
+      }
+//      region.x = mAvailSpaceRect.XMost() - region.width;
     }
     else {
       region.x = mAvailSpaceRect.XMost() - region.width;
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h
index 95c5a39d5ec..ce73c0be285 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.h
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.h
@@ -361,6 +361,9 @@ public:
 
   PRBool mUnconstrainedHeight;
 
+  PRBool mSkippedRightFloaters;
+  nsSize mSkippedMaxElementSize;
+
   // The content area to reflow child frames within. The x/y
   // coordinates are known to be mBorderPadding.left and
   // mBorderPadding.top. The width/height may be NS_UNCONSTRAINEDSIZE
@@ -507,6 +510,8 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
       mContentArea.width = aReflowState.availableWidth - lr;
     }
   }
+  mSkippedRightFloaters = PR_FALSE;
+  mSkippedMaxElementSize.SizeTo(0, 0);
 
   // Compute content area height. Unlike the width, if we have a
   // specified style height we ignore it since extra content is
@@ -1573,15 +1578,19 @@ nsBlockFrame::ComputeFinalSize(const nsHTMLReflowState& aReflowState,
       (((0 == aState.mKidXMost) ||
         (0 == aState.mKidXMost - borderPadding.left)) &&
        (0 == aState.mY - borderPadding.top))) {
-    // Zero out the works
+    // Zero out most everything
     aMetrics.width = 0;
     aMetrics.height = 0;
     aMetrics.ascent = 0;
     aMetrics.descent = 0;
     aMetrics.mCarriedOutBottomMargin = 0;
+
+    // Note: Don't zero out the max-element-sizes: they will be zero
+    // if this is truly empty, otherwise they won't because of a
+    // floater.
     if (nsnull != aMetrics.maxElementSize) {
-      aMetrics.maxElementSize->width = 0;
-      aMetrics.maxElementSize->height = 0;
+      aMetrics.maxElementSize->width = aState.mMaxElementSize.width;
+      aMetrics.maxElementSize->height = aState.mMaxElementSize.height;
     }
   }
   else {
@@ -3743,14 +3752,26 @@ nsBlockFrame::PlaceLine(nsBlockReflowState& aState,
       printf("PASS1 ");
     }
     ListTag(stdout);
-    printf(": line.floaters=%d band.floaterCount=%d\n",
-           aLine->mFloaters ? aLine->mFloaters->Count() : -1,
+    printf(": line.floaters=%s band.floaterCount=%d\n",
+           aLine->mFloaters.NotEmpty() ? "yes" : "no",
            aState.mBand.GetFloaterCount());
 #endif
     if (0 != aState.mBand.GetFloaterCount()) {
       // Add in floater impacts to the lines max-element-size
       ComputeLineMaxElementSize(aState, aLine, &maxElementSize);
     }
+
+    // Factor in any skipped right floaters...
+    if (aState.mSkippedRightFloaters) {
+      if (aState.mSkippedMaxElementSize.width > maxElementSize.width) {
+        maxElementSize.width = aState.mSkippedMaxElementSize.width;
+      }
+      if (aState.mSkippedMaxElementSize.height > maxElementSize.height) {
+        maxElementSize.height = aState.mSkippedMaxElementSize.height;
+      }
+      aState.mSkippedMaxElementSize.SizeTo(0, 0);
+      aState.mSkippedRightFloaters = PR_FALSE;
+    }
   }
   PostPlaceLine(aState, aLine, maxElementSize);
 
@@ -5117,6 +5138,14 @@ nsBlockReflowState::PlaceFloater(nsFloaterCache* aFloaterCache,
       // pretend that the floater ended up at the left margin...
       okToAddRectRegion = PR_FALSE;
       region.x = mAvailSpaceRect.x;
+      mSkippedRightFloaters = PR_TRUE;
+      if (region.width > mSkippedMaxElementSize.width) {
+        mSkippedMaxElementSize.width = region.width;
+      }
+      if (region.height > mSkippedMaxElementSize.height) {
+        mSkippedMaxElementSize.height = region.height;
+      }
+//      region.x = mAvailSpaceRect.XMost() - region.width;
     }
     else {
       region.x = mAvailSpaceRect.XMost() - region.width;