Rename PushTruncatedPlaceholderLine since the remaining reasons for lines being truncated are related to being next to floats, not having truncated floats. (Bug 563584, patch 19) r=roc

layout/generic/nsBlockFrame.cpp

@@ -3417,14 +3417,10 @@ nsBlockFrame::ReflowInlineFrames(nsBlockReflowState& aState,
   return rv;
 }
 
-// If at least one float on the line was complete, not at the top of
-// page, but was truncated, then restore the overflow floats to what
-// they were before and push the line.  The floats that will be removed
-// from the list aren't yet known by the block's next in flow.  
 void
-nsBlockFrame::PushTruncatedPlaceholderLine(nsBlockReflowState& aState,
-                                           line_iterator       aLine,
-                                           PRBool&             aKeepReflowGoing)
+nsBlockFrame::PushTruncatedLine(nsBlockReflowState& aState,
+                                line_iterator       aLine,
+                                PRBool&             aKeepReflowGoing)
 {
   line_iterator prevLine = aLine;
   --prevLine;
@@ -3638,7 +3634,7 @@ nsBlockFrame::DoReflowInlineFrames(nsBlockReflowState& aState,
         // next to a float.
         lineReflowStatus = LINE_REFLOW_TRUNCATED;
         // Push the line that didn't fit
-        PushTruncatedPlaceholderLine(aState, aLine, *aKeepReflowGoing);
+        PushTruncatedLine(aState, aLine, *aKeepReflowGoing);
       }
     }
 

layout/generic/nsBlockFrame.h

@@ -617,11 +617,11 @@ protected:
                                          nsIFrame*           aFrame,
                                          PRBool&             aMadeNewFrame);
 
-  // Push aLine which contains a positioned element that was truncated. Clean up any 
-  // placeholders on the same line that were continued. Set aKeepReflowGoing to false. 
-  void PushTruncatedPlaceholderLine(nsBlockReflowState& aState,
-                                    line_iterator       aLine,
-                                    PRBool&             aKeepReflowGoing);
+  // Push aLine, which cannot be placed on this page/column but should
+  // fit on a future one.  Set aKeepReflowGoing to false.
+  void PushTruncatedLine(nsBlockReflowState& aState,
+                         line_iterator       aLine,
+                         PRBool&             aKeepReflowGoing);
 
   nsresult SplitLine(nsBlockReflowState& aState,
                      nsLineLayout& aLineLayout,