diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 6eb90decd8c..f231cf53041 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/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 diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp index 49fde83aca6..dd23d2f43aa 100644 --- a/layout/generic/nsBlockReflowState.cpp +++ b/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(mBlock->GetNextInFlow()); NS_WARN_IF_FALSE(NS_UNCONSTRAINEDSIZE != aReflowState.ComputedWidth(), diff --git a/layout/generic/nsBlockReflowState.h b/layout/generic/nsBlockReflowState.h index a25951b9ee4..1e811d6cc9c 100644 --- a/layout/generic/nsBlockReflowState.h +++ b/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);