From 6b3dd64c1649e4eba805907b23238d9d2a12b9e7 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Fri, 5 Mar 1999 04:23:41 +0000 Subject: [PATCH] Spanked almost away --- layout/html/base/src/nsFrameReflowState.h | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/layout/html/base/src/nsFrameReflowState.h b/layout/html/base/src/nsFrameReflowState.h index 4e790f19950b..c48ce7c7f43b 100644 --- a/layout/html/base/src/nsFrameReflowState.h +++ b/layout/html/base/src/nsFrameReflowState.h @@ -33,12 +33,10 @@ struct nsStyleText; class nsFrameReflowState : public nsHTMLReflowState { public: - nsFrameReflowState(nsIPresContext& aPresContext, - const nsHTMLReflowState& aReflowState, - const nsHTMLReflowMetrics& aMetrics); - ~nsFrameReflowState(); + nsFrameReflowState(nsIPresContext& aPresContext); - void SetupChildReflowState(nsHTMLReflowState& aChildReflowState); + void Init(const nsHTMLReflowState& aReflowState, + const nsHTMLReflowMetrics& aMetrics); nsIPresContext& mPresContext; nsIFrame* mNextRCFrame; @@ -48,8 +46,6 @@ public: // Style data pointers for frame const nsStyleText* mStyleText; - const nsStyleDisplay* mStyleDisplay; - const nsStyleSpacing* mStyleSpacing; // This is true if no-wrap is set for frame PRBool mNoWrap; @@ -80,15 +76,6 @@ public: // The frames border+padding value nsMargin mBorderPadding; - // Is this frame a root for margin collapsing? - PRBool mIsMarginRoot; - - // The computed collapsed top margin value that the frame did not - // apply but is passing out to the frames parent so that the parent - // can perform generational margin collapsing. This value ends up - // being copied into the nsHTMLReflowMetrics.mCarriedOutTopMargin. - nscoord mCarriedOutTopMargin; - // The previous child frames collapsed bottom margin value. nscoord mPrevBottomMargin;