Bug 836899: Remove nsBlockReflowState constructor unused parameter 'aMetrics'. r=dbaron

layout/generic/nsBlockFrame.cpp

@@ -993,7 +993,7 @@ nsBlockFrame::Reflow(nsPresContext*           aPresContext,
 
   bool topMarginRoot, bottomMarginRoot;
   IsMarginRoot(&topMarginRoot, &bottomMarginRoot);
-  nsBlockReflowState state(*reflowState, aPresContext, this, aMetrics,
+  nsBlockReflowState state(*reflowState, aPresContext, this,
                            topMarginRoot, bottomMarginRoot, needFloatManager);
 
 #ifdef IBMBIDI

layout/generic/nsBlockReflowState.cpp

@@ -32,7 +32,6 @@ using namespace mozilla::layout;
 nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
                                        nsPresContext* aPresContext,
                                        nsBlockFrame* aFrame,
-                                       const nsHTMLReflowMetrics& aMetrics,
                                        bool aTopMarginRoot,
                                        bool aBottomMarginRoot,
                                        bool aBlockNeedsFloatManager)
@@ -77,7 +76,6 @@ nsBlockReflowState::nsBlockReflowState(const nsHTMLReflowState& aReflowState,
 
   mReflowStatus = NS_FRAME_COMPLETE;
 
-  mPresContext = aPresContext;
   mNextInFlow = static_cast<nsBlockFrame*>(mBlock->GetNextInFlow());
 
   NS_WARN_IF_FALSE(NS_UNCONSTRAINEDSIZE != aReflowState.ComputedWidth(),

layout/generic/nsBlockReflowState.h

@@ -36,7 +36,6 @@ public:
   nsBlockReflowState(const nsHTMLReflowState& aReflowState,
                      nsPresContext* aPresContext,
                      nsBlockFrame* aFrame,
-                     const nsHTMLReflowMetrics& aMetrics,
                      bool aTopMarginRoot, bool aBottomMarginRoot,
                      bool aBlockNeedsFloatManager);