Re-ordered DeleteFrame() code to fix a FMR

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);

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);

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);

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);

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);

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);