Fixed block frame Clear method to work properly

layout/generic/nsBlockFrame.cpp

@@ -553,9 +553,10 @@ nsBlockFrame::DrainOverflowList()
 void
 nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
 {
+  for (;;) {
     if (aState.mCurrentBand.count <= 1) {
       // No floaters in this band therefore nothing to clear
-    return;
+      break;
     }
 
     // Find the Y coordinate to clear to
@@ -626,14 +627,20 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
       }
     }
 
+    if (clearYMost == aState.mY) {
+      // Nothing to clear
+      break;
+    }
+
     NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
                  ("nsBlockFrame::ClearFloaters: mY=%d clearYMost=%d\n",
                   aState.mY, clearYMost));
 
-  aState.mY = clearYMost;
+    aState.mY = clearYMost + 1;
 
     // Get a new band
     GetAvailableSpace(aState, aState.mY);
+  }
 }
 
 nsresult

layout/generic/nsBlockReflowState.cpp

@@ -553,9 +553,10 @@ nsBlockFrame::DrainOverflowList()
 void
 nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
 {
+  for (;;) {
     if (aState.mCurrentBand.count <= 1) {
       // No floaters in this band therefore nothing to clear
-    return;
+      break;
     }
 
     // Find the Y coordinate to clear to
@@ -626,14 +627,20 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
       }
     }
 
+    if (clearYMost == aState.mY) {
+      // Nothing to clear
+      break;
+    }
+
     NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
                  ("nsBlockFrame::ClearFloaters: mY=%d clearYMost=%d\n",
                   aState.mY, clearYMost));
 
-  aState.mY = clearYMost;
+    aState.mY = clearYMost + 1;
 
     // Get a new band
     GetAvailableSpace(aState, aState.mY);
+  }
 }
 
 nsresult

layout/generic/nsBlockReflowState.h

@@ -553,9 +553,10 @@ nsBlockFrame::DrainOverflowList()
 void
 nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
 {
+  for (;;) {
     if (aState.mCurrentBand.count <= 1) {
       // No floaters in this band therefore nothing to clear
-    return;
+      break;
     }
 
     // Find the Y coordinate to clear to
@@ -626,14 +627,20 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
       }
     }
 
+    if (clearYMost == aState.mY) {
+      // Nothing to clear
+      break;
+    }
+
     NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
                  ("nsBlockFrame::ClearFloaters: mY=%d clearYMost=%d\n",
                   aState.mY, clearYMost));
 
-  aState.mY = clearYMost;
+    aState.mY = clearYMost + 1;
 
     // Get a new band
     GetAvailableSpace(aState, aState.mY);
+  }
 }
 
 nsresult

layout/html/base/src/nsBlockFrame.cpp

@@ -553,9 +553,10 @@ nsBlockFrame::DrainOverflowList()
 void
 nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
 {
+  for (;;) {
     if (aState.mCurrentBand.count <= 1) {
       // No floaters in this band therefore nothing to clear
-    return;
+      break;
     }
 
     // Find the Y coordinate to clear to
@@ -626,14 +627,20 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
       }
     }
 
+    if (clearYMost == aState.mY) {
+      // Nothing to clear
+      break;
+    }
+
     NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
                  ("nsBlockFrame::ClearFloaters: mY=%d clearYMost=%d\n",
                   aState.mY, clearYMost));
 
-  aState.mY = clearYMost;
+    aState.mY = clearYMost + 1;
 
     // Get a new band
     GetAvailableSpace(aState, aState.mY);
+  }
 }
 
 nsresult

layout/html/base/src/nsBlockReflowState.cpp

@@ -553,9 +553,10 @@ nsBlockFrame::DrainOverflowList()
 void
 nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
 {
+  for (;;) {
     if (aState.mCurrentBand.count <= 1) {
       // No floaters in this band therefore nothing to clear
-    return;
+      break;
     }
 
     // Find the Y coordinate to clear to
@@ -626,14 +627,20 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
       }
     }
 
+    if (clearYMost == aState.mY) {
+      // Nothing to clear
+      break;
+    }
+
     NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
                  ("nsBlockFrame::ClearFloaters: mY=%d clearYMost=%d\n",
                   aState.mY, clearYMost));
 
-  aState.mY = clearYMost;
+    aState.mY = clearYMost + 1;
 
     // Get a new band
     GetAvailableSpace(aState, aState.mY);
+  }
 }
 
 nsresult

layout/html/base/src/nsBlockReflowState.h

@@ -553,9 +553,10 @@ nsBlockFrame::DrainOverflowList()
 void
 nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
 {
+  for (;;) {
     if (aState.mCurrentBand.count <= 1) {
       // No floaters in this band therefore nothing to clear
-    return;
+      break;
     }
 
     // Find the Y coordinate to clear to
@@ -626,14 +627,20 @@ nsBlockFrame::ClearFloaters(nsBlockReflowState& aState, PRUint8 aBreakType)
       }
     }
 
+    if (clearYMost == aState.mY) {
+      // Nothing to clear
+      break;
+    }
+
     NS_FRAME_LOG(NS_FRAME_TRACE_CHILD_REFLOW,
                  ("nsBlockFrame::ClearFloaters: mY=%d clearYMost=%d\n",
                   aState.mY, clearYMost));
 
-  aState.mY = clearYMost;
+    aState.mY = clearYMost + 1;
 
     // Get a new band
     GetAvailableSpace(aState, aState.mY);
+  }
 }
 
 nsresult