From ddda9d285c98cfd5594cb643c08d6d439ef0bf80 Mon Sep 17 00:00:00 2001
From: Mats Palmgren <matspal@gmail.com>
Date: Tue, 13 May 2014 00:47:53 +0000
Subject: [PATCH] Bug 1008917 - part 14, make
 nsAbsoluteContainingBlock::Reflow() return type 'void'.  r=roc

---
 layout/generic/nsAbsoluteContainingBlock.cpp |  3 +--
 layout/generic/nsAbsoluteContainingBlock.h   | 18 +++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/layout/generic/nsAbsoluteContainingBlock.cpp b/layout/generic/nsAbsoluteContainingBlock.cpp
index b3d9c0f10d51..85439f01b5d9 100644
--- a/layout/generic/nsAbsoluteContainingBlock.cpp
+++ b/layout/generic/nsAbsoluteContainingBlock.cpp
@@ -108,7 +108,7 @@ nsAbsoluteContainingBlock::RemoveFrame(nsIFrame*       aDelegatingFrame,
   mAbsoluteFrames.DestroyFrame(aOldFrame);
 }
 
-nsresult
+void
 nsAbsoluteContainingBlock::Reflow(nsContainerFrame*        aDelegatingFrame,
                                   nsPresContext*           aPresContext,
                                   const nsHTMLReflowState& aReflowState,
@@ -193,7 +193,6 @@ nsAbsoluteContainingBlock::Reflow(nsContainerFrame*        aDelegatingFrame,
     NS_FRAME_SET_OVERFLOW_INCOMPLETE(reflowStatus);
 
   NS_MergeReflowStatusInto(&aReflowStatus, reflowStatus);
-  return NS_OK;
 }
 
 static inline bool IsFixedPaddingSize(const nsStyleCoord& aCoord)
diff --git a/layout/generic/nsAbsoluteContainingBlock.h b/layout/generic/nsAbsoluteContainingBlock.h
index 6e9c3e828bcb..d42c350b5beb 100644
--- a/layout/generic/nsAbsoluteContainingBlock.h
+++ b/layout/generic/nsAbsoluteContainingBlock.h
@@ -82,15 +82,15 @@ public:
    * status of the delegating frame's main reflow. This function merges in the
    * statuses of the absolutely positioned children's reflows.
    */
-  nsresult Reflow(nsContainerFrame*        aDelegatingFrame,
-                  nsPresContext*           aPresContext,
-                  const nsHTMLReflowState& aReflowState,
-                  nsReflowStatus&          aReflowStatus,
-                  const nsRect&            aContainingBlock,
-                  bool                     aConstrainHeight,
-                  bool                     aCBWidthChanged,
-                  bool                     aCBHeightChanged,
-                  nsOverflowAreas*         aOverflowAreas);
+  void Reflow(nsContainerFrame*        aDelegatingFrame,
+              nsPresContext*           aPresContext,
+              const nsHTMLReflowState& aReflowState,
+              nsReflowStatus&          aReflowStatus,
+              const nsRect&            aContainingBlock,
+              bool                     aConstrainHeight,
+              bool                     aCBWidthChanged,
+              bool                     aCBHeightChanged,
+              nsOverflowAreas*         aOverflowAreas);
 
   void DestroyFrames(nsIFrame* aDelegatingFrame,
                      nsIFrame* aDestructRoot);