update to new nsIInlineReflow API

layout/html/base/src/nsBRPart.cpp

@@ -41,7 +41,8 @@ public:
                    const nsRect& aDirtyRect);
 
   // nsIInlineReflow
-  NS_IMETHOD FindTextRuns(nsCSSLineLayout& aLineLayout);
+  NS_IMETHOD FindTextRuns(nsCSSLineLayout&  aLineLayout,
+                          nsIReflowCommand* aReflowCommand);
   NS_IMETHOD InlineReflow(nsCSSLineLayout&     aLineLayout,
                           nsReflowMetrics&     aDesiredSize,
                           const nsReflowState& aReflowState);
@@ -90,7 +91,8 @@ BRFrame::Paint(nsIPresContext&      aPresContext,
 }
 
 NS_IMETHODIMP
-BRFrame::FindTextRuns(nsCSSLineLayout& aLineLayout)
+BRFrame::FindTextRuns(nsCSSLineLayout&  aLineLayout,
+                      nsIReflowCommand* aReflowCommand)
 {
   aLineLayout.EndTextRun();
   return NS_OK;

layout/html/base/src/nsHTMLBullet.cpp

@@ -82,7 +82,8 @@ public:
   NS_IMETHOD List(FILE* out, PRInt32 aIndent) const;
 
   // nsIInlineReflow
-  NS_IMETHOD FindTextRuns(nsCSSLineLayout& aLineLayout);
+  NS_IMETHOD FindTextRuns(nsCSSLineLayout&  aLineLayout,
+                          nsIReflowCommand* aReflowCommand);
   NS_IMETHOD InlineReflow(nsCSSLineLayout&     aLineLayout,
                           nsReflowMetrics&     aMetrics,
                           const nsReflowState& aReflowState);
@@ -623,7 +624,8 @@ BulletFrame::InlineReflow(nsCSSLineLayout&     aLineLayout,
 }
 
 NS_IMETHODIMP
-BulletFrame::FindTextRuns(nsCSSLineLayout& aLineLayout)
+BulletFrame::FindTextRuns(nsCSSLineLayout&  aLineLayout,
+                          nsIReflowCommand* aReflowCommand)
 {
   aLineLayout.EndTextRun();
   return NS_OK;

layout/html/base/src/nsRootPart.cpp

@@ -458,7 +458,13 @@ NS_METHOD RootContentFrame::Reflow(nsIPresContext*      aPresContext,
       }
     }
   }
-  PropagateContentOffsets();
+
+  // We are always a pseudo-frame; make sure our content offset is
+  // properly pushed upwards
+  nsContainerFrame* parent = (nsContainerFrame*) mGeometricParent;
+  parent->PropagateContentOffsets(this, mFirstContentOffset,
+                                  mLastContentOffset, mLastContentIsComplete);
+
 #ifdef NS_DEBUG
   PostReflowCheck(aStatus);
 #endif

layout/html/base/src/nsSpacerPart.cpp

@@ -41,7 +41,8 @@ public:
   NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);
 
   // nsIInlineReflow
-  NS_IMETHOD FindTextRuns(nsCSSLineLayout& aLineLayout);
+  NS_IMETHOD FindTextRuns(nsCSSLineLayout&  aLineLayout,
+                          nsIReflowCommand* aReflowCommand);
   NS_IMETHOD InlineReflow(nsCSSLineLayout&     aLineLayout,
                           nsReflowMetrics&     aDesiredSize,
                           const nsReflowState& aReflowState);
@@ -168,7 +169,8 @@ SpacerFrame::InlineReflow(nsCSSLineLayout&     aLineLayout,
 }
 
 NS_IMETHODIMP
-SpacerFrame::FindTextRuns(nsCSSLineLayout& aLineLayout)
+SpacerFrame::FindTextRuns(nsCSSLineLayout&  aLineLayout,
+                          nsIReflowCommand* aReflowCommand)
 {
   aLineLayout.EndTextRun();
   return NS_OK;

layout/html/base/src/nsTextContent.cpp

@@ -140,7 +140,8 @@ public:
   NS_IMETHOD ListTag(FILE* out) const;
 
   // nsIInlineReflow
-  NS_IMETHOD FindTextRuns(nsCSSLineLayout& aLineLayout);
+  NS_IMETHOD FindTextRuns(nsCSSLineLayout&  aLineLayout,
+                          nsIReflowCommand* aReflowCommand);
   NS_IMETHOD InlineReflow(nsCSSLineLayout&     aLineLayout,
                           nsReflowMetrics&     aMetrics,
                           const nsReflowState& aReflowState);
@@ -654,7 +655,8 @@ TextFrame::PaintRegularText(nsIPresContext& aPresContext,
 }
 
 NS_IMETHODIMP
-TextFrame::FindTextRuns(nsCSSLineLayout& aLineLayout)
+TextFrame::FindTextRuns(nsCSSLineLayout&  aLineLayout,
+                        nsIReflowCommand* aReflowCommand)
 {
   if (nsnull == mPrevInFlow) {
     aLineLayout.AddText(this);