From c6590e6940d3aa07c9ae38f7f396b67642a8bd3a Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Wed, 10 Feb 1999 18:12:24 +0000 Subject: [PATCH] Re-ordered DeleteFrame() code to fix a FMR git-svn-id: svn://10.0.0.236/trunk@20269 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockFrame.cpp | 6 +++--- mozilla/layout/generic/nsBlockReflowState.cpp | 6 +++--- mozilla/layout/generic/nsBlockReflowState.h | 6 +++--- mozilla/layout/html/base/src/nsBlockFrame.cpp | 6 +++--- mozilla/layout/html/base/src/nsBlockReflowState.cpp | 6 +++--- mozilla/layout/html/base/src/nsBlockReflowState.h | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index dad86068d63..b52e0b1f536 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -419,9 +419,6 @@ nsBlockFrame::~nsBlockFrame() NS_IMETHODIMP nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) { - nsLineBox::DeleteLineList(aPresContext, mLines); - nsLineBox::DeleteLineList(aPresContext, mOverflowLines); - // When we have a bullet frame and it's not in our child list then // we need to delete it ourselves (this is the common case for // list-item's that have outside bullets). @@ -431,6 +428,9 @@ nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) mBullet = nsnull; } + nsLineBox::DeleteLineList(aPresContext, mLines); + nsLineBox::DeleteLineList(aPresContext, mOverflowLines); + mFloaters.DeleteFrames(aPresContext); return nsBlockFrameSuper::DeleteFrame(aPresContext); diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index dad86068d63..b52e0b1f536 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -419,9 +419,6 @@ nsBlockFrame::~nsBlockFrame() NS_IMETHODIMP nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) { - nsLineBox::DeleteLineList(aPresContext, mLines); - nsLineBox::DeleteLineList(aPresContext, mOverflowLines); - // When we have a bullet frame and it's not in our child list then // we need to delete it ourselves (this is the common case for // list-item's that have outside bullets). @@ -431,6 +428,9 @@ nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) mBullet = nsnull; } + nsLineBox::DeleteLineList(aPresContext, mLines); + nsLineBox::DeleteLineList(aPresContext, mOverflowLines); + mFloaters.DeleteFrames(aPresContext); return nsBlockFrameSuper::DeleteFrame(aPresContext); diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index dad86068d63..b52e0b1f536 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -419,9 +419,6 @@ nsBlockFrame::~nsBlockFrame() NS_IMETHODIMP nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) { - nsLineBox::DeleteLineList(aPresContext, mLines); - nsLineBox::DeleteLineList(aPresContext, mOverflowLines); - // When we have a bullet frame and it's not in our child list then // we need to delete it ourselves (this is the common case for // list-item's that have outside bullets). @@ -431,6 +428,9 @@ nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) mBullet = nsnull; } + nsLineBox::DeleteLineList(aPresContext, mLines); + nsLineBox::DeleteLineList(aPresContext, mOverflowLines); + mFloaters.DeleteFrames(aPresContext); return nsBlockFrameSuper::DeleteFrame(aPresContext); diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index dad86068d63..b52e0b1f536 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -419,9 +419,6 @@ nsBlockFrame::~nsBlockFrame() NS_IMETHODIMP nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) { - nsLineBox::DeleteLineList(aPresContext, mLines); - nsLineBox::DeleteLineList(aPresContext, mOverflowLines); - // When we have a bullet frame and it's not in our child list then // we need to delete it ourselves (this is the common case for // list-item's that have outside bullets). @@ -431,6 +428,9 @@ nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) mBullet = nsnull; } + nsLineBox::DeleteLineList(aPresContext, mLines); + nsLineBox::DeleteLineList(aPresContext, mOverflowLines); + mFloaters.DeleteFrames(aPresContext); return nsBlockFrameSuper::DeleteFrame(aPresContext); diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index dad86068d63..b52e0b1f536 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -419,9 +419,6 @@ nsBlockFrame::~nsBlockFrame() NS_IMETHODIMP nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) { - nsLineBox::DeleteLineList(aPresContext, mLines); - nsLineBox::DeleteLineList(aPresContext, mOverflowLines); - // When we have a bullet frame and it's not in our child list then // we need to delete it ourselves (this is the common case for // list-item's that have outside bullets). @@ -431,6 +428,9 @@ nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) mBullet = nsnull; } + nsLineBox::DeleteLineList(aPresContext, mLines); + nsLineBox::DeleteLineList(aPresContext, mOverflowLines); + mFloaters.DeleteFrames(aPresContext); return nsBlockFrameSuper::DeleteFrame(aPresContext); diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index dad86068d63..b52e0b1f536 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -419,9 +419,6 @@ nsBlockFrame::~nsBlockFrame() NS_IMETHODIMP nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) { - nsLineBox::DeleteLineList(aPresContext, mLines); - nsLineBox::DeleteLineList(aPresContext, mOverflowLines); - // When we have a bullet frame and it's not in our child list then // we need to delete it ourselves (this is the common case for // list-item's that have outside bullets). @@ -431,6 +428,9 @@ nsBlockFrame::DeleteFrame(nsIPresContext& aPresContext) mBullet = nsnull; } + nsLineBox::DeleteLineList(aPresContext, mLines); + nsLineBox::DeleteLineList(aPresContext, mOverflowLines); + mFloaters.DeleteFrames(aPresContext); return nsBlockFrameSuper::DeleteFrame(aPresContext);