Reworked the state recovery logic for incremental reflow

layout/generic/nsBlockFrame.h

@@ -145,14 +145,13 @@ protected:
     return 0 != (mState & NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET);
   }
 
-  void SlideFrames(nsIPresContext& aPresContext,
+  void SlideLine(nsIPresContext& aPresContext,
                  nsISpaceManager* aSpaceManager,
                  nsLineBox* aLine, nscoord aDY);
 
   void SlideFloaters(nsIPresContext& aPresContext,
                      nsISpaceManager* aSpaceManager,
-                     nsLineBox* aLine, nscoord aDY,
-                     PRBool aUpdateSpaceManager);
+                     nsLineBox* aLine, nscoord aDY);
 
   PRBool DrainOverflowLines();
 
@@ -183,7 +182,7 @@ protected:
 
   nsresult ReflowDirtyLines(nsBlockReflowState& aState);
 
-  nsresult RecoverStateFrom(nsBlockReflowState& aState,
+  void RecoverStateFrom(nsBlockReflowState& aState,
                         nsLineBox* aLine,
                         nscoord aDeltaY);
 

layout/html/base/src/nsBlockFrame.h

@@ -145,14 +145,13 @@ protected:
     return 0 != (mState & NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET);
   }
 
-  void SlideFrames(nsIPresContext& aPresContext,
+  void SlideLine(nsIPresContext& aPresContext,
                  nsISpaceManager* aSpaceManager,
                  nsLineBox* aLine, nscoord aDY);
 
   void SlideFloaters(nsIPresContext& aPresContext,
                      nsISpaceManager* aSpaceManager,
-                     nsLineBox* aLine, nscoord aDY,
-                     PRBool aUpdateSpaceManager);
+                     nsLineBox* aLine, nscoord aDY);
 
   PRBool DrainOverflowLines();
 
@@ -183,7 +182,7 @@ protected:
 
   nsresult ReflowDirtyLines(nsBlockReflowState& aState);
 
-  nsresult RecoverStateFrom(nsBlockReflowState& aState,
+  void RecoverStateFrom(nsBlockReflowState& aState,
                         nsLineBox* aLine,
                         nscoord aDeltaY);