From f7cd4556fbc65f11dcdb3cfe6ea93fffccf140ef Mon Sep 17 00:00:00 2001 From: kipp Date: Thu, 25 Jun 1998 21:11:12 +0000 Subject: [PATCH] Use different (implicit copy) constructor to get proper reason passed through for better handling of incremental reflow git-svn-id: svn://10.0.0.236/trunk@4528 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/css/layout/src/nsCSSBlockFrame.cpp | 3 +-- mozilla/layout/css/layout/src/nsCSSInlineFrame.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mozilla/layout/css/layout/src/nsCSSBlockFrame.cpp b/mozilla/layout/css/layout/src/nsCSSBlockFrame.cpp index 1934b2d9f7b..7baedecf092 100644 --- a/mozilla/layout/css/layout/src/nsCSSBlockFrame.cpp +++ b/mozilla/layout/css/layout/src/nsCSSBlockFrame.cpp @@ -556,8 +556,7 @@ nsCSSBlockReflowState::nsCSSBlockReflowState(nsIPresContext* aPresContext, nsIStyleContext* aBlockSC, const nsReflowState& aReflowState, PRBool aComputeMaxElementSize) - : nsReflowState(aBlock, *aReflowState.parentReflowState, - aReflowState.maxSize), + : nsReflowState(aReflowState), mLineLayout(aPresContext, aSpaceManager), mInlineLayout(mLineLayout, aBlock, aBlockSC) { diff --git a/mozilla/layout/css/layout/src/nsCSSInlineFrame.cpp b/mozilla/layout/css/layout/src/nsCSSInlineFrame.cpp index 9c34a0cda3f..d7571b5989f 100644 --- a/mozilla/layout/css/layout/src/nsCSSInlineFrame.cpp +++ b/mozilla/layout/css/layout/src/nsCSSInlineFrame.cpp @@ -43,7 +43,7 @@ nsCSSInlineReflowState::nsCSSInlineReflowState(nsCSSLineLayout& aLineLayout, nsIStyleContext* aInlineSC, const nsReflowState& aRS, PRBool aComputeMaxElementSize) - : nsReflowState(aInlineFrame, *aRS.parentReflowState, aRS.maxSize), + : nsReflowState(aRS), mInlineLayout(aLineLayout, aInlineFrame, aInlineSC) { // While we skip around the reflow state that our parent gave us so