Bug 1008917 - part 11, make nsBlockFrame::ReflowDirtyLines() and nsLineLayout::ReflowFrame() return types 'void'. r=roc

layout/generic/nsBlockFrame.cpp

@@ -1846,13 +1846,9 @@ static void DumpLine(const nsBlockReflowState& aState, nsLineBox* aLine,
 #endif
 }
 
-/**
- * Reflow the dirty lines
- */
-nsresult
+void
 nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
 {
-  nsresult rv = NS_OK;
   bool keepGoing = true;
   bool repositionViews = false; // should we really need this?
   bool foundAnyClears = aState.mFloatBreakType != NS_STYLE_CLEAR_NONE;
@@ -2447,8 +2443,6 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
            aState.mReflowStatus);
   }
 #endif
-
-  return rv;
 }
 
 static void MarkAllDescendantLinesDirty(nsBlockFrame* aBlock)

layout/generic/nsBlockFrame.h

@@ -580,7 +580,7 @@ protected:
   void PrepareResizeReflow(nsBlockReflowState& aState);
 
   /** reflow all lines that have been marked dirty */
-  nsresult ReflowDirtyLines(nsBlockReflowState& aState);
+  void ReflowDirtyLines(nsBlockReflowState& aState);
 
   /** Mark a given line dirty due to reflow being interrupted on or before it */
   void MarkLineDirtyForInterrupt(nsLineBox* aLine);

layout/generic/nsLineLayout.cpp

@@ -711,7 +711,7 @@ IsPercentageAware(const nsIFrame* aFrame)
   return false;
 }
 
-nsresult
+void
 nsLineLayout::ReflowFrame(nsIFrame* aFrame,
                           nsReflowStatus& aReflowStatus,
                           nsHTMLReflowMetrics* aMetrics,
@@ -1052,8 +1052,6 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
   nsFrame::ListTag(stdout, aFrame);
   printf(" status=%x\n", aReflowStatus);
 #endif
-
-  return NS_OK;
 }
 
 void

layout/generic/nsLineLayout.h

@@ -78,11 +78,11 @@ public:
   bool IsZeroBSize();
 
   // Reflows the frame and returns the reflow status. aPushedFrame is true
-  // if the frame is pushed to the next line because it doesn't fit
-  nsresult ReflowFrame(nsIFrame* aFrame,
-                       nsReflowStatus& aReflowStatus,
-                       nsHTMLReflowMetrics* aMetrics,
-                       bool& aPushedFrame);
+  // if the frame is pushed to the next line because it doesn't fit.
+  void ReflowFrame(nsIFrame* aFrame,
+                   nsReflowStatus& aReflowStatus,
+                   nsHTMLReflowMetrics* aMetrics,
+                   bool& aPushedFrame);
 
   void AddBulletFrame(nsIFrame* aFrame, const nsHTMLReflowMetrics& aMetrics);