diff --git a/layout/base/public/nsFrameList.h b/layout/base/public/nsFrameList.h index c53f4830c46..1dd0a8aa07a 100644 --- a/layout/base/public/nsFrameList.h +++ b/layout/base/public/nsFrameList.h @@ -38,7 +38,7 @@ public: ~nsFrameList() { } - void DeleteFrames(nsIPresContext& aPresContext); + void DestroyFrames(nsIPresContext& aPresContext); void SetFrames(nsIFrame* aFrameList) { mFirstChild = aFrameList; @@ -63,10 +63,10 @@ public: // in behavior to calling RemoveFrame(FirstChild()). PRBool RemoveFirstChild(); - // Take aFrame out of the frame list and then delete it. This also + // Take aFrame out of the frame list and then destroy it. This also // disconnects aFrame from the sibling list. This will return // PR_FALSE if aFrame is nsnull or if aFrame is not in the list. - PRBool DeleteFrame(nsIPresContext& aPresContext, nsIFrame* aFrame); + PRBool DestroyFrame(nsIPresContext& aPresContext, nsIFrame* aFrame); void InsertFrame(nsIFrame* aParent, nsIFrame* aPrevSibling, @@ -86,10 +86,10 @@ public: nsIFrame* aOldFrame, nsIFrame* aNewFrame); - PRBool ReplaceAndDeleteFrame(nsIPresContext& aPresContext, - nsIFrame* aParent, - nsIFrame* aOldFrame, - nsIFrame* aNewFrame); + PRBool ReplaceAndDestroyFrame(nsIPresContext& aPresContext, + nsIFrame* aParent, + nsIFrame* aOldFrame, + nsIFrame* aNewFrame); PRBool Split(nsIFrame* aAfterFrame, nsIFrame** aNextFrameResult); diff --git a/layout/base/src/nsFrameList.cpp b/layout/base/src/nsFrameList.cpp index 4a2ce7b7328..37221bd5282 100644 --- a/layout/base/src/nsFrameList.cpp +++ b/layout/base/src/nsFrameList.cpp @@ -19,7 +19,7 @@ #include "nsFrameList.h" void -nsFrameList::DeleteFrames(nsIPresContext& aPresContext) +nsFrameList::DestroyFrames(nsIPresContext& aPresContext) { nsIFrame* frame = mFirstChild; while (nsnull != frame) { @@ -107,7 +107,7 @@ nsFrameList::RemoveFirstChild() } PRBool -nsFrameList::DeleteFrame(nsIPresContext& aPresContext, nsIFrame* aFrame) +nsFrameList::DestroyFrame(nsIPresContext& aPresContext, nsIFrame* aFrame) { NS_PRECONDITION(nsnull != aFrame, "null ptr"); if (RemoveFrame(aFrame)) { @@ -200,10 +200,10 @@ nsFrameList::ReplaceFrame(nsIFrame* aParent, } PRBool -nsFrameList::ReplaceAndDeleteFrame(nsIPresContext& aPresContext, - nsIFrame* aParent, - nsIFrame* aOldFrame, - nsIFrame* aNewFrame) +nsFrameList::ReplaceAndDestroyFrame(nsIPresContext& aPresContext, + nsIFrame* aParent, + nsIFrame* aOldFrame, + nsIFrame* aNewFrame) { NS_PRECONDITION(nsnull != aOldFrame, "null ptr"); NS_PRECONDITION(nsnull != aNewFrame, "null ptr"); diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index 95650ffb840..092e7117fe5 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -973,7 +973,7 @@ NS_IMETHODIMP nsComboboxControlFrame::Destroy(nsIPresContext& aPresContext) { // Cleanup frames in popup child list - mPopupFrames.DeleteFrames(aPresContext); + mPopupFrames.DestroyFrames(aPresContext); return nsAreaFrame::Destroy(aPresContext); } diff --git a/layout/generic/nsAbsoluteContainingBlock.cpp b/layout/generic/nsAbsoluteContainingBlock.cpp index 8e5206cf94d..fe4d5eda0e1 100644 --- a/layout/generic/nsAbsoluteContainingBlock.cpp +++ b/layout/generic/nsAbsoluteContainingBlock.cpp @@ -29,7 +29,7 @@ static NS_DEFINE_IID(kAreaFrameIID, NS_IAREAFRAME_IID); void nsAbsoluteContainingBlock::DestroyFrames(nsIPresContext& aPresContext) { - mAbsoluteFrames.DeleteFrames(aPresContext); + mAbsoluteFrames.DestroyFrames(aPresContext); } nsresult @@ -114,7 +114,7 @@ nsAbsoluteContainingBlock::IncrementalReflow(nsIPresContext& aPresConte nsIFrame* childFrame; aReflowState.reflowCommand->GetChildFrame(childFrame); - PRBool result = mAbsoluteFrames.DeleteFrame(aPresContext, childFrame); + PRBool result = mAbsoluteFrames.DestroyFrame(aPresContext, childFrame); NS_ASSERTION(result, "didn't find frame to delete"); } else if (nsIReflowCommand::FrameInserted == type) { diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 7e2669b8107..a294a6e04cf 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -817,7 +817,7 @@ nsBlockFrame::Destroy(nsIPresContext& aPresContext) mBullet = nsnull; } - mFloaters.DeleteFrames(aPresContext); + mFloaters.DestroyFrames(aPresContext); nsLineBox::DeleteLineList(aPresContext, mLines); nsLineBox::DeleteLineList(aPresContext, mOverflowLines); diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp index 7e2669b8107..a294a6e04cf 100644 --- a/layout/generic/nsBlockReflowState.cpp +++ b/layout/generic/nsBlockReflowState.cpp @@ -817,7 +817,7 @@ nsBlockFrame::Destroy(nsIPresContext& aPresContext) mBullet = nsnull; } - mFloaters.DeleteFrames(aPresContext); + mFloaters.DestroyFrames(aPresContext); nsLineBox::DeleteLineList(aPresContext, mLines); nsLineBox::DeleteLineList(aPresContext, mOverflowLines); diff --git a/layout/generic/nsBlockReflowState.h b/layout/generic/nsBlockReflowState.h index 7e2669b8107..a294a6e04cf 100644 --- a/layout/generic/nsBlockReflowState.h +++ b/layout/generic/nsBlockReflowState.h @@ -817,7 +817,7 @@ nsBlockFrame::Destroy(nsIPresContext& aPresContext) mBullet = nsnull; } - mFloaters.DeleteFrames(aPresContext); + mFloaters.DestroyFrames(aPresContext); nsLineBox::DeleteLineList(aPresContext, mLines); nsLineBox::DeleteLineList(aPresContext, mOverflowLines); diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp index 199521b30a6..fcca501c123 100644 --- a/layout/generic/nsContainerFrame.cpp +++ b/layout/generic/nsContainerFrame.cpp @@ -76,7 +76,7 @@ nsContainerFrame::Destroy(nsIPresContext& aPresContext) } // Delete the primary child list - mFrames.DeleteFrames(aPresContext); + mFrames.DestroyFrames(aPresContext); // Base class will destroy the frame return nsFrame::Destroy(aPresContext); diff --git a/layout/generic/nsFrameList.cpp b/layout/generic/nsFrameList.cpp index 4a2ce7b7328..37221bd5282 100644 --- a/layout/generic/nsFrameList.cpp +++ b/layout/generic/nsFrameList.cpp @@ -19,7 +19,7 @@ #include "nsFrameList.h" void -nsFrameList::DeleteFrames(nsIPresContext& aPresContext) +nsFrameList::DestroyFrames(nsIPresContext& aPresContext) { nsIFrame* frame = mFirstChild; while (nsnull != frame) { @@ -107,7 +107,7 @@ nsFrameList::RemoveFirstChild() } PRBool -nsFrameList::DeleteFrame(nsIPresContext& aPresContext, nsIFrame* aFrame) +nsFrameList::DestroyFrame(nsIPresContext& aPresContext, nsIFrame* aFrame) { NS_PRECONDITION(nsnull != aFrame, "null ptr"); if (RemoveFrame(aFrame)) { @@ -200,10 +200,10 @@ nsFrameList::ReplaceFrame(nsIFrame* aParent, } PRBool -nsFrameList::ReplaceAndDeleteFrame(nsIPresContext& aPresContext, - nsIFrame* aParent, - nsIFrame* aOldFrame, - nsIFrame* aNewFrame) +nsFrameList::ReplaceAndDestroyFrame(nsIPresContext& aPresContext, + nsIFrame* aParent, + nsIFrame* aOldFrame, + nsIFrame* aNewFrame) { NS_PRECONDITION(nsnull != aOldFrame, "null ptr"); NS_PRECONDITION(nsnull != aNewFrame, "null ptr"); diff --git a/layout/generic/nsFrameList.h b/layout/generic/nsFrameList.h index c53f4830c46..1dd0a8aa07a 100644 --- a/layout/generic/nsFrameList.h +++ b/layout/generic/nsFrameList.h @@ -38,7 +38,7 @@ public: ~nsFrameList() { } - void DeleteFrames(nsIPresContext& aPresContext); + void DestroyFrames(nsIPresContext& aPresContext); void SetFrames(nsIFrame* aFrameList) { mFirstChild = aFrameList; @@ -63,10 +63,10 @@ public: // in behavior to calling RemoveFrame(FirstChild()). PRBool RemoveFirstChild(); - // Take aFrame out of the frame list and then delete it. This also + // Take aFrame out of the frame list and then destroy it. This also // disconnects aFrame from the sibling list. This will return // PR_FALSE if aFrame is nsnull or if aFrame is not in the list. - PRBool DeleteFrame(nsIPresContext& aPresContext, nsIFrame* aFrame); + PRBool DestroyFrame(nsIPresContext& aPresContext, nsIFrame* aFrame); void InsertFrame(nsIFrame* aParent, nsIFrame* aPrevSibling, @@ -86,10 +86,10 @@ public: nsIFrame* aOldFrame, nsIFrame* aNewFrame); - PRBool ReplaceAndDeleteFrame(nsIPresContext& aPresContext, - nsIFrame* aParent, - nsIFrame* aOldFrame, - nsIFrame* aNewFrame); + PRBool ReplaceAndDestroyFrame(nsIPresContext& aPresContext, + nsIFrame* aParent, + nsIFrame* aOldFrame, + nsIFrame* aNewFrame); PRBool Split(nsIFrame* aAfterFrame, nsIFrame** aNextFrameResult); diff --git a/layout/generic/nsHTMLFrame.cpp b/layout/generic/nsHTMLFrame.cpp index 0f12b1e9638..034b0717a56 100644 --- a/layout/generic/nsHTMLFrame.cpp +++ b/layout/generic/nsHTMLFrame.cpp @@ -186,7 +186,7 @@ RootFrame::Reflow(nsIPresContext& aPresContext, deletedFrame->GetRect(damageRect); Invalidate(damageRect, PR_FALSE); - mFrames.DeleteFrame(aPresContext, deletedFrame); + mFrames.DestroyFrame(aPresContext, deletedFrame); } break; diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index 43546418c15..ec770ec5732 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/layout/generic/nsInlineFrame.cpp @@ -320,7 +320,7 @@ nsInlineFrame::GetFrameType(nsIAtom** aType) const NS_IMETHODIMP nsInlineFrame::Destroy(nsIPresContext& aPresContext) { - mFrames.DeleteFrames(aPresContext); + mFrames.DestroyFrames(aPresContext); return nsInlineFrameSuper::Destroy(aPresContext); } @@ -980,7 +980,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, if (NS_FRAME_NOT_SPLITTABLE != st) { aOldFrame->RemoveFromFlow(); } - parent->mFrames.DeleteFrame(aPresContext, aOldFrame); + parent->mFrames.DestroyFrame(aPresContext, aOldFrame); aOldFrame = oldFrameNextInFlow; if (nsnull != aOldFrame) { aOldFrame->GetParent((nsIFrame**) &parent); @@ -1012,7 +1012,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, nsFrameList blockKids(kids); if (1 == blockKids.GetLength()) { // Remove the anonymous block - mFrames.DeleteFrame(aPresContext, anonymousBlock); + mFrames.DestroyFrame(aPresContext, anonymousBlock); generateReflowCommand = PR_TRUE; target = this; #ifdef NOISY_ANON_BLOCK diff --git a/layout/generic/nsViewportFrame.cpp b/layout/generic/nsViewportFrame.cpp index db75a549f6d..3a28c7c1606 100644 --- a/layout/generic/nsViewportFrame.cpp +++ b/layout/generic/nsViewportFrame.cpp @@ -111,7 +111,7 @@ NS_NewViewportFrame(nsIFrame** aNewFrame) NS_IMETHODIMP ViewportFrame::Destroy(nsIPresContext& aPresContext) { - mFixedFrames.DeleteFrames(aPresContext); + mFixedFrames.DestroyFrames(aPresContext); return nsContainerFrame::Destroy(aPresContext); } @@ -309,7 +309,7 @@ ViewportFrame::IncrementalReflow(nsIPresContext& aPresContext, nsIFrame* childFrame; aReflowState.reflowCommand->GetChildFrame(childFrame); - PRBool result = mFixedFrames.DeleteFrame(aPresContext, childFrame); + PRBool result = mFixedFrames.DestroyFrame(aPresContext, childFrame); NS_ASSERTION(result, "didn't find frame to delete"); } else if (nsIReflowCommand::FrameInserted == type) { diff --git a/layout/html/base/src/nsAbsoluteContainingBlock.cpp b/layout/html/base/src/nsAbsoluteContainingBlock.cpp index 8e5206cf94d..fe4d5eda0e1 100644 --- a/layout/html/base/src/nsAbsoluteContainingBlock.cpp +++ b/layout/html/base/src/nsAbsoluteContainingBlock.cpp @@ -29,7 +29,7 @@ static NS_DEFINE_IID(kAreaFrameIID, NS_IAREAFRAME_IID); void nsAbsoluteContainingBlock::DestroyFrames(nsIPresContext& aPresContext) { - mAbsoluteFrames.DeleteFrames(aPresContext); + mAbsoluteFrames.DestroyFrames(aPresContext); } nsresult @@ -114,7 +114,7 @@ nsAbsoluteContainingBlock::IncrementalReflow(nsIPresContext& aPresConte nsIFrame* childFrame; aReflowState.reflowCommand->GetChildFrame(childFrame); - PRBool result = mAbsoluteFrames.DeleteFrame(aPresContext, childFrame); + PRBool result = mAbsoluteFrames.DestroyFrame(aPresContext, childFrame); NS_ASSERTION(result, "didn't find frame to delete"); } else if (nsIReflowCommand::FrameInserted == type) { diff --git a/layout/html/base/src/nsBlockFrame.cpp b/layout/html/base/src/nsBlockFrame.cpp index 7e2669b8107..a294a6e04cf 100644 --- a/layout/html/base/src/nsBlockFrame.cpp +++ b/layout/html/base/src/nsBlockFrame.cpp @@ -817,7 +817,7 @@ nsBlockFrame::Destroy(nsIPresContext& aPresContext) mBullet = nsnull; } - mFloaters.DeleteFrames(aPresContext); + mFloaters.DestroyFrames(aPresContext); nsLineBox::DeleteLineList(aPresContext, mLines); nsLineBox::DeleteLineList(aPresContext, mOverflowLines); diff --git a/layout/html/base/src/nsBlockReflowState.cpp b/layout/html/base/src/nsBlockReflowState.cpp index 7e2669b8107..a294a6e04cf 100644 --- a/layout/html/base/src/nsBlockReflowState.cpp +++ b/layout/html/base/src/nsBlockReflowState.cpp @@ -817,7 +817,7 @@ nsBlockFrame::Destroy(nsIPresContext& aPresContext) mBullet = nsnull; } - mFloaters.DeleteFrames(aPresContext); + mFloaters.DestroyFrames(aPresContext); nsLineBox::DeleteLineList(aPresContext, mLines); nsLineBox::DeleteLineList(aPresContext, mOverflowLines); diff --git a/layout/html/base/src/nsBlockReflowState.h b/layout/html/base/src/nsBlockReflowState.h index 7e2669b8107..a294a6e04cf 100644 --- a/layout/html/base/src/nsBlockReflowState.h +++ b/layout/html/base/src/nsBlockReflowState.h @@ -817,7 +817,7 @@ nsBlockFrame::Destroy(nsIPresContext& aPresContext) mBullet = nsnull; } - mFloaters.DeleteFrames(aPresContext); + mFloaters.DestroyFrames(aPresContext); nsLineBox::DeleteLineList(aPresContext, mLines); nsLineBox::DeleteLineList(aPresContext, mOverflowLines); diff --git a/layout/html/base/src/nsContainerFrame.cpp b/layout/html/base/src/nsContainerFrame.cpp index 199521b30a6..fcca501c123 100644 --- a/layout/html/base/src/nsContainerFrame.cpp +++ b/layout/html/base/src/nsContainerFrame.cpp @@ -76,7 +76,7 @@ nsContainerFrame::Destroy(nsIPresContext& aPresContext) } // Delete the primary child list - mFrames.DeleteFrames(aPresContext); + mFrames.DestroyFrames(aPresContext); // Base class will destroy the frame return nsFrame::Destroy(aPresContext); diff --git a/layout/html/base/src/nsHTMLFrame.cpp b/layout/html/base/src/nsHTMLFrame.cpp index 0f12b1e9638..034b0717a56 100644 --- a/layout/html/base/src/nsHTMLFrame.cpp +++ b/layout/html/base/src/nsHTMLFrame.cpp @@ -186,7 +186,7 @@ RootFrame::Reflow(nsIPresContext& aPresContext, deletedFrame->GetRect(damageRect); Invalidate(damageRect, PR_FALSE); - mFrames.DeleteFrame(aPresContext, deletedFrame); + mFrames.DestroyFrame(aPresContext, deletedFrame); } break; diff --git a/layout/html/base/src/nsInlineFrame.cpp b/layout/html/base/src/nsInlineFrame.cpp index 43546418c15..ec770ec5732 100644 --- a/layout/html/base/src/nsInlineFrame.cpp +++ b/layout/html/base/src/nsInlineFrame.cpp @@ -320,7 +320,7 @@ nsInlineFrame::GetFrameType(nsIAtom** aType) const NS_IMETHODIMP nsInlineFrame::Destroy(nsIPresContext& aPresContext) { - mFrames.DeleteFrames(aPresContext); + mFrames.DestroyFrames(aPresContext); return nsInlineFrameSuper::Destroy(aPresContext); } @@ -980,7 +980,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, if (NS_FRAME_NOT_SPLITTABLE != st) { aOldFrame->RemoveFromFlow(); } - parent->mFrames.DeleteFrame(aPresContext, aOldFrame); + parent->mFrames.DestroyFrame(aPresContext, aOldFrame); aOldFrame = oldFrameNextInFlow; if (nsnull != aOldFrame) { aOldFrame->GetParent((nsIFrame**) &parent); @@ -1012,7 +1012,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, nsFrameList blockKids(kids); if (1 == blockKids.GetLength()) { // Remove the anonymous block - mFrames.DeleteFrame(aPresContext, anonymousBlock); + mFrames.DestroyFrame(aPresContext, anonymousBlock); generateReflowCommand = PR_TRUE; target = this; #ifdef NOISY_ANON_BLOCK diff --git a/layout/html/base/src/nsViewportFrame.cpp b/layout/html/base/src/nsViewportFrame.cpp index db75a549f6d..3a28c7c1606 100644 --- a/layout/html/base/src/nsViewportFrame.cpp +++ b/layout/html/base/src/nsViewportFrame.cpp @@ -111,7 +111,7 @@ NS_NewViewportFrame(nsIFrame** aNewFrame) NS_IMETHODIMP ViewportFrame::Destroy(nsIPresContext& aPresContext) { - mFixedFrames.DeleteFrames(aPresContext); + mFixedFrames.DestroyFrames(aPresContext); return nsContainerFrame::Destroy(aPresContext); } @@ -309,7 +309,7 @@ ViewportFrame::IncrementalReflow(nsIPresContext& aPresContext, nsIFrame* childFrame; aReflowState.reflowCommand->GetChildFrame(childFrame); - PRBool result = mFixedFrames.DeleteFrame(aPresContext, childFrame); + PRBool result = mFixedFrames.DestroyFrame(aPresContext, childFrame); NS_ASSERTION(result, "didn't find frame to delete"); } else if (nsIReflowCommand::FrameInserted == type) { diff --git a/layout/html/forms/src/nsComboboxControlFrame.cpp b/layout/html/forms/src/nsComboboxControlFrame.cpp index 95650ffb840..092e7117fe5 100644 --- a/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -973,7 +973,7 @@ NS_IMETHODIMP nsComboboxControlFrame::Destroy(nsIPresContext& aPresContext) { // Cleanup frames in popup child list - mPopupFrames.DeleteFrames(aPresContext); + mPopupFrames.DestroyFrames(aPresContext); return nsAreaFrame::Destroy(aPresContext); } diff --git a/layout/html/table/src/nsTableColGroupFrame.cpp b/layout/html/table/src/nsTableColGroupFrame.cpp index 1d7213ec36e..bc427d65155 100644 --- a/layout/html/table/src/nsTableColGroupFrame.cpp +++ b/layout/html/table/src/nsTableColGroupFrame.cpp @@ -307,7 +307,7 @@ NS_METHOD nsTableColGroupFrame::IR_TargetIsMe(nsIPresContext& aPresCont else { - rv = mFrames.DeleteFrame(aPresContext, objectFrame); + rv = mFrames.DestroyFrame(aPresContext, objectFrame); } break; diff --git a/layout/html/table/src/nsTableFrame.cpp b/layout/html/table/src/nsTableFrame.cpp index fd53be26d35..69698d5e2bf 100644 --- a/layout/html/table/src/nsTableFrame.cpp +++ b/layout/html/table/src/nsTableFrame.cpp @@ -344,7 +344,7 @@ nsTableFrame::~nsTableFrame() NS_IMETHODIMP nsTableFrame::Destroy(nsIPresContext& aPresContext) { - mColGroups.DeleteFrames(aPresContext); + mColGroups.DestroyFrames(aPresContext); return nsHTMLContainerFrame::Destroy(aPresContext); } @@ -3313,7 +3313,7 @@ NS_METHOD nsTableFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = mFrames.DeleteFrame(aPresContext, objectFrame); + rv = mFrames.DestroyFrame(aPresContext, objectFrame); } break; @@ -3603,7 +3603,7 @@ NS_METHOD nsTableFrame::IR_RowGroupRemoved(nsIPresContext& aPresContext, nsTableRowGroupFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("TIF IR: IR_RowGroupRemoved for frame %p\n", aDeletedFrame); - nsresult rv = mFrames.DeleteFrame(aPresContext, aDeletedFrame); + nsresult rv = mFrames.DestroyFrame(aPresContext, aDeletedFrame); InvalidateCellMap(); InvalidateColumnCache(); diff --git a/layout/html/table/src/nsTableRowFrame.cpp b/layout/html/table/src/nsTableRowFrame.cpp index cde5c86a1e5..82ed2a40cbf 100644 --- a/layout/html/table/src/nsTableRowFrame.cpp +++ b/layout/html/table/src/nsTableRowFrame.cpp @@ -1109,7 +1109,7 @@ NS_METHOD nsTableRowFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = mFrames.DeleteFrame(aPresContext, objectFrame); + rv = mFrames.DestroyFrame(aPresContext, objectFrame); } break; @@ -1263,7 +1263,7 @@ NS_METHOD nsTableRowFrame::IR_CellRemoved(nsIPresContext& aPresContext, nsTableCellFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("\nRow IR: IR_RowRemoved\n"); - nsresult rv = mFrames.DeleteFrame(aPresContext, (nsIFrame*)aDeletedFrame); + nsresult rv = mFrames.DestroyFrame(aPresContext, (nsIFrame*)aDeletedFrame); if (NS_SUCCEEDED(rv)) { ResetMaxChildHeight(); diff --git a/layout/html/table/src/nsTableRowGroupFrame.cpp b/layout/html/table/src/nsTableRowGroupFrame.cpp index 37b0a829420..6611c38338e 100644 --- a/layout/html/table/src/nsTableRowGroupFrame.cpp +++ b/layout/html/table/src/nsTableRowGroupFrame.cpp @@ -1180,7 +1180,7 @@ NS_METHOD nsTableRowGroupFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = mFrames.DeleteFrame(aPresContext, objectFrame); + rv = mFrames.DestroyFrame(aPresContext, objectFrame); } break; @@ -1236,7 +1236,7 @@ NS_METHOD nsTableRowGroupFrame::IR_RowGroupRemoved(nsIPresContext& aPresC nsTableRowGroupFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("TIF IR: IR_RowGroupRemoved for frame %p\n", aDeletedFrame); - nsresult rv = mFrames.DeleteFrame(aPresContext, aDeletedFrame); + nsresult rv = mFrames.DestroyFrame(aPresContext, aDeletedFrame); aReflowState.tableFrame->InvalidateCellMap(); aReflowState.tableFrame->InvalidateColumnCache(); @@ -1412,7 +1412,7 @@ NS_METHOD nsTableRowGroupFrame::IR_RowRemoved(nsIPresContext& aPresContext, nsTableRowFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("\nTRGF IR: IR_RowRemoved\n"); - nsresult rv = mFrames.DeleteFrame(aPresContext, (nsIFrame *)aDeletedFrame); + nsresult rv = mFrames.DestroyFrame(aPresContext, (nsIFrame *)aDeletedFrame); if (NS_SUCCEEDED(rv)) { aReflowState.tableFrame->InvalidateCellMap(); diff --git a/layout/tables/nsTableColGroupFrame.cpp b/layout/tables/nsTableColGroupFrame.cpp index 1d7213ec36e..bc427d65155 100644 --- a/layout/tables/nsTableColGroupFrame.cpp +++ b/layout/tables/nsTableColGroupFrame.cpp @@ -307,7 +307,7 @@ NS_METHOD nsTableColGroupFrame::IR_TargetIsMe(nsIPresContext& aPresCont else { - rv = mFrames.DeleteFrame(aPresContext, objectFrame); + rv = mFrames.DestroyFrame(aPresContext, objectFrame); } break; diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp index fd53be26d35..69698d5e2bf 100644 --- a/layout/tables/nsTableFrame.cpp +++ b/layout/tables/nsTableFrame.cpp @@ -344,7 +344,7 @@ nsTableFrame::~nsTableFrame() NS_IMETHODIMP nsTableFrame::Destroy(nsIPresContext& aPresContext) { - mColGroups.DeleteFrames(aPresContext); + mColGroups.DestroyFrames(aPresContext); return nsHTMLContainerFrame::Destroy(aPresContext); } @@ -3313,7 +3313,7 @@ NS_METHOD nsTableFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = mFrames.DeleteFrame(aPresContext, objectFrame); + rv = mFrames.DestroyFrame(aPresContext, objectFrame); } break; @@ -3603,7 +3603,7 @@ NS_METHOD nsTableFrame::IR_RowGroupRemoved(nsIPresContext& aPresContext, nsTableRowGroupFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("TIF IR: IR_RowGroupRemoved for frame %p\n", aDeletedFrame); - nsresult rv = mFrames.DeleteFrame(aPresContext, aDeletedFrame); + nsresult rv = mFrames.DestroyFrame(aPresContext, aDeletedFrame); InvalidateCellMap(); InvalidateColumnCache(); diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp index cde5c86a1e5..82ed2a40cbf 100644 --- a/layout/tables/nsTableRowFrame.cpp +++ b/layout/tables/nsTableRowFrame.cpp @@ -1109,7 +1109,7 @@ NS_METHOD nsTableRowFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = mFrames.DeleteFrame(aPresContext, objectFrame); + rv = mFrames.DestroyFrame(aPresContext, objectFrame); } break; @@ -1263,7 +1263,7 @@ NS_METHOD nsTableRowFrame::IR_CellRemoved(nsIPresContext& aPresContext, nsTableCellFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("\nRow IR: IR_RowRemoved\n"); - nsresult rv = mFrames.DeleteFrame(aPresContext, (nsIFrame*)aDeletedFrame); + nsresult rv = mFrames.DestroyFrame(aPresContext, (nsIFrame*)aDeletedFrame); if (NS_SUCCEEDED(rv)) { ResetMaxChildHeight(); diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp index 37b0a829420..6611c38338e 100644 --- a/layout/tables/nsTableRowGroupFrame.cpp +++ b/layout/tables/nsTableRowGroupFrame.cpp @@ -1180,7 +1180,7 @@ NS_METHOD nsTableRowGroupFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = mFrames.DeleteFrame(aPresContext, objectFrame); + rv = mFrames.DestroyFrame(aPresContext, objectFrame); } break; @@ -1236,7 +1236,7 @@ NS_METHOD nsTableRowGroupFrame::IR_RowGroupRemoved(nsIPresContext& aPresC nsTableRowGroupFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("TIF IR: IR_RowGroupRemoved for frame %p\n", aDeletedFrame); - nsresult rv = mFrames.DeleteFrame(aPresContext, aDeletedFrame); + nsresult rv = mFrames.DestroyFrame(aPresContext, aDeletedFrame); aReflowState.tableFrame->InvalidateCellMap(); aReflowState.tableFrame->InvalidateColumnCache(); @@ -1412,7 +1412,7 @@ NS_METHOD nsTableRowGroupFrame::IR_RowRemoved(nsIPresContext& aPresContext, nsTableRowFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("\nTRGF IR: IR_RowRemoved\n"); - nsresult rv = mFrames.DeleteFrame(aPresContext, (nsIFrame *)aDeletedFrame); + nsresult rv = mFrames.DestroyFrame(aPresContext, (nsIFrame *)aDeletedFrame); if (NS_SUCCEEDED(rv)) { aReflowState.tableFrame->InvalidateCellMap(); diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp index 11ff34de0ff..a056981c319 100644 --- a/layout/xul/base/src/nsBoxFrame.cpp +++ b/layout/xul/base/src/nsBoxFrame.cpp @@ -977,7 +977,7 @@ nsBoxFrame::RemoveFrame(nsIPresContext& aPresContext, // remove the child frame nsresult rv = nsHTMLContainerFrame::RemoveFrame(aPresContext, aPresShell, aListName, aOldFrame); - mFrames.DeleteFrame(aPresContext, aOldFrame); + mFrames.DestroyFrame(aPresContext, aOldFrame); return rv; } diff --git a/layout/xul/base/src/nsDeckFrame.cpp b/layout/xul/base/src/nsDeckFrame.cpp index eff2ab58100..b35d1b80438 100644 --- a/layout/xul/base/src/nsDeckFrame.cpp +++ b/layout/xul/base/src/nsDeckFrame.cpp @@ -495,7 +495,7 @@ nsDeckFrame::RemoveFrame(nsIPresContext& aPresContext, { // remove the child frame nsresult rv = nsHTMLContainerFrame::RemoveFrame(aPresContext, aPresShell, aListName, aOldFrame); - mFrames.DeleteFrame(aPresContext, aOldFrame); + mFrames.DestroyFrame(aPresContext, aOldFrame); return rv; } diff --git a/layout/xul/base/src/nsMenuFrame.cpp b/layout/xul/base/src/nsMenuFrame.cpp index 5389a871eee..e72a5e81a02 100644 --- a/layout/xul/base/src/nsMenuFrame.cpp +++ b/layout/xul/base/src/nsMenuFrame.cpp @@ -167,7 +167,7 @@ NS_IMETHODIMP nsMenuFrame::Destroy(nsIPresContext& aPresContext) { // Cleanup frames in popup child list - mPopupFrames.DeleteFrames(aPresContext); + mPopupFrames.DestroyFrames(aPresContext); return nsBoxFrame::Destroy(aPresContext); } diff --git a/layout/xul/base/src/nsSliderFrame.cpp b/layout/xul/base/src/nsSliderFrame.cpp index 6adeb2da819..b8158b0096f 100644 --- a/layout/xul/base/src/nsSliderFrame.cpp +++ b/layout/xul/base/src/nsSliderFrame.cpp @@ -658,7 +658,7 @@ nsSliderFrame::RemoveFrame(nsIPresContext& aPresContext, { // remove the child frame nsresult rv = nsHTMLContainerFrame::RemoveFrame(aPresContext, aPresShell, aListName, aOldFrame); - mFrames.DeleteFrame(aPresContext, aOldFrame); + mFrames.DestroyFrame(aPresContext, aOldFrame); return rv; } diff --git a/layout/xul/base/src/nsTreeRowGroupFrame.cpp b/layout/xul/base/src/nsTreeRowGroupFrame.cpp index a4fe8029076..5d98eaf9bf5 100644 --- a/layout/xul/base/src/nsTreeRowGroupFrame.cpp +++ b/layout/xul/base/src/nsTreeRowGroupFrame.cpp @@ -136,7 +136,7 @@ void nsTreeRowGroupFrame::DestroyRows(nsIPresContext& aPresContext, PRInt32& row nsIFrame* nextFrame; GetNextFrame(childFrame, &nextFrame); mFrameConstructor->RemoveMappingsForFrameSubtree(&aPresContext, childFrame); - mFrames.DeleteFrame(aPresContext, childFrame); + mFrames.DestroyFrame(aPresContext, childFrame); mTopFrame = childFrame = nextFrame; } } @@ -170,7 +170,7 @@ void nsTreeRowGroupFrame::ReverseDestroyRows(nsIPresContext& aPresContext, PRInt nsIFrame* prevFrame; prevFrame = mFrames.GetPrevSiblingFor(childFrame); mFrameConstructor->RemoveMappingsForFrameSubtree(&aPresContext, childFrame); - mFrames.DeleteFrame(aPresContext, childFrame); + mFrames.DestroyFrame(aPresContext, childFrame); mBottomFrame = childFrame = prevFrame; } } @@ -460,7 +460,7 @@ nsTreeRowGroupFrame::PositionChanged(nsIPresContext& aPresContext, PRInt32 aOldI // as a hint to figure out how to build the frames. // Remove the scrollbar first. mFrameConstructor->RemoveMappingsForFrameSubtree(&aPresContext, this); - mFrames.DeleteFrames(aPresContext); + mFrames.DestroyFrames(aPresContext); nsCOMPtr topRowContent; FindRowContentAtIndex(aNewIndex, mContent, getter_AddRefs(topRowContent)); if (topRowContent) @@ -644,7 +644,7 @@ nsTreeRowGroupFrame::ReflowAfterRowLayout(nsIPresContext& aPresContext, if (value == "0" && !mIsFull) { // Nuke the scrollbar. mFrameConstructor->RemoveMappingsForFrameSubtree(&aPresContext, mScrollbar); - mScrollbarList.DeleteFrames(aPresContext); + mScrollbarList.DestroyFrames(aPresContext); mScrollbar = nsnull; } } @@ -940,7 +940,7 @@ PRBool nsTreeRowGroupFrame::ContinueReflow(nsIPresContext& aPresContext, nscoord nsIFrame* nextFrame; currFrame->GetNextSibling(&nextFrame); mFrameConstructor->RemoveMappingsForFrameSubtree(&aPresContext, currFrame); - mFrames.DeleteFrame(aPresContext, currFrame); + mFrames.DestroyFrame(aPresContext, currFrame); currFrame = nextFrame; } } @@ -989,7 +989,7 @@ void nsTreeRowGroupFrame::OnContentRemoved(nsIPresContext& aPresContext, // Go ahead and delete the frame. if (aChildFrame) { mFrameConstructor->RemoveMappingsForFrameSubtree(&aPresContext, aChildFrame); - mFrames.DeleteFrame(aPresContext, aChildFrame); + mFrames.DestroyFrame(aPresContext, aChildFrame); treeFrame->InvalidateCellMap(); treeFrame->InvalidateColumnCache(); }