From 473511a1eb440a58c3c3ada2e4e183decd4529c3 Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Mon, 12 Apr 1999 23:46:02 +0000 Subject: [PATCH] Removed some code from nsContainerFrame that is no longer needed now that' we have nsFrameList git-svn-id: svn://10.0.0.236/trunk@27238 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsContainerFrame.cpp | 10 +------ mozilla/layout/generic/nsContainerFrame.h | 28 ------------------- .../layout/html/base/src/nsContainerFrame.cpp | 10 +------ .../layout/html/base/src/nsContainerFrame.h | 28 ------------------- .../html/table/src/nsTableColGroupFrame.cpp | 2 +- .../layout/html/table/src/nsTableFrame.cpp | 8 ++---- .../html/table/src/nsTableOuterFrame.cpp | 3 +- .../layout/html/table/src/nsTableRowFrame.cpp | 4 +-- .../html/table/src/nsTableRowGroupFrame.cpp | 4 +-- .../layout/tables/nsTableColGroupFrame.cpp | 2 +- mozilla/layout/tables/nsTableFrame.cpp | 8 ++---- mozilla/layout/tables/nsTableOuterFrame.cpp | 3 +- mozilla/layout/tables/nsTableRowFrame.cpp | 4 +-- .../layout/tables/nsTableRowGroupFrame.cpp | 4 +-- 14 files changed, 20 insertions(+), 98 deletions(-) diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp index 80ba058234e..4b99fb6a093 100644 --- a/mozilla/layout/generic/nsContainerFrame.cpp +++ b/mozilla/layout/generic/nsContainerFrame.cpp @@ -432,7 +432,7 @@ void nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* aChild) { - NS_PRECONDITION(IsChild(aChild), "bad geometric parent"); + NS_PRECONDITION(mFrames.ContainsFrame(aChild), "bad geometric parent"); nsIFrame* nextInFlow; nsContainerFrame* parent; @@ -570,14 +570,6 @@ nsContainerFrame::AddFrame(const nsHTMLReflowState& aReflowState, return rv; } -nsresult -nsContainerFrame::RemoveAFrame(nsIFrame* aRemovedFrame) -{ - PRBool zap = mFrames.RemoveFrame(aRemovedFrame); - NS_ASSERTION(zap, "failure to remove a frame"); - return NS_OK; -} - ///////////////////////////////////////////////////////////////////////////// // Debugging diff --git a/mozilla/layout/generic/nsContainerFrame.h b/mozilla/layout/generic/nsContainerFrame.h index a4c45e85ca7..cab9098f232 100644 --- a/mozilla/layout/generic/nsContainerFrame.h +++ b/mozilla/layout/generic/nsContainerFrame.h @@ -59,13 +59,6 @@ public: return tmp.GetLength(); } -#if XXX - static nsIFrame* FrameAt(nsIFrame* aFrameList, PRInt32 aIndex) { - nsFrameList tmp(aFrameList); - return tmp.FrameAt(aIndex); - } -#endif - protected: nsContainerFrame(); ~nsContainerFrame(); @@ -124,32 +117,11 @@ protected: */ void PushChildren(nsIFrame* aFromChild, nsIFrame* aPrevSibling); - /** - * Append child list starting at aChild to this frame's child list. - * - * @param aChild the beginning of the child list - * @param aSetParent if true each child's parent is set to this frame. - */ - void AppendChildren(nsIFrame* aChild, PRBool aSetParent) { - mFrames.AppendFrames(aSetParent ? this : nsnull, aChild); - } - /** */ nsresult AddFrame(const nsHTMLReflowState& aReflowState, nsIFrame * aAddedFrame); - /** - */ - nsresult RemoveAFrame(nsIFrame* aRemovedFrame); - - /** - * Returns PR_TRUE if aChild is a child of this frame. - */ - PRBool IsChild(const nsIFrame* aChild) const { - return mFrames.ContainsFrame(aChild); - } - nsFrameList mFrames; nsFrameList mOverflowFrames; }; diff --git a/mozilla/layout/html/base/src/nsContainerFrame.cpp b/mozilla/layout/html/base/src/nsContainerFrame.cpp index 80ba058234e..4b99fb6a093 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsContainerFrame.cpp @@ -432,7 +432,7 @@ void nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* aChild) { - NS_PRECONDITION(IsChild(aChild), "bad geometric parent"); + NS_PRECONDITION(mFrames.ContainsFrame(aChild), "bad geometric parent"); nsIFrame* nextInFlow; nsContainerFrame* parent; @@ -570,14 +570,6 @@ nsContainerFrame::AddFrame(const nsHTMLReflowState& aReflowState, return rv; } -nsresult -nsContainerFrame::RemoveAFrame(nsIFrame* aRemovedFrame) -{ - PRBool zap = mFrames.RemoveFrame(aRemovedFrame); - NS_ASSERTION(zap, "failure to remove a frame"); - return NS_OK; -} - ///////////////////////////////////////////////////////////////////////////// // Debugging diff --git a/mozilla/layout/html/base/src/nsContainerFrame.h b/mozilla/layout/html/base/src/nsContainerFrame.h index a4c45e85ca7..cab9098f232 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.h +++ b/mozilla/layout/html/base/src/nsContainerFrame.h @@ -59,13 +59,6 @@ public: return tmp.GetLength(); } -#if XXX - static nsIFrame* FrameAt(nsIFrame* aFrameList, PRInt32 aIndex) { - nsFrameList tmp(aFrameList); - return tmp.FrameAt(aIndex); - } -#endif - protected: nsContainerFrame(); ~nsContainerFrame(); @@ -124,32 +117,11 @@ protected: */ void PushChildren(nsIFrame* aFromChild, nsIFrame* aPrevSibling); - /** - * Append child list starting at aChild to this frame's child list. - * - * @param aChild the beginning of the child list - * @param aSetParent if true each child's parent is set to this frame. - */ - void AppendChildren(nsIFrame* aChild, PRBool aSetParent) { - mFrames.AppendFrames(aSetParent ? this : nsnull, aChild); - } - /** */ nsresult AddFrame(const nsHTMLReflowState& aReflowState, nsIFrame * aAddedFrame); - /** - */ - nsresult RemoveAFrame(nsIFrame* aRemovedFrame); - - /** - * Returns PR_TRUE if aChild is a child of this frame. - */ - PRBool IsChild(const nsIFrame* aChild) const { - return mFrames.ContainsFrame(aChild); - } - nsFrameList mFrames; nsFrameList mOverflowFrames; }; diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp index 9a3f05485b9..e031149ef47 100644 --- a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp @@ -288,7 +288,7 @@ NS_METHOD nsTableColGroupFrame::IR_TargetIsMe(nsIPresContext& aPresCont else { - rv = RemoveAFrame(objectFrame); + rv = mFrames.RemoveFrame(objectFrame); } break; diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index 491f6131635..8b0f28194b4 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -3163,7 +3163,7 @@ NS_METHOD nsTableFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = RemoveAFrame(objectFrame); + rv = mFrames.RemoveFrame(objectFrame); } break; @@ -3453,7 +3453,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 = RemoveAFrame(aDeletedFrame); + nsresult rv = mFrames.RemoveFrame(aDeletedFrame); InvalidateCellMap(); InvalidateColumnCache(); @@ -3784,10 +3784,8 @@ NS_METHOD nsTableFrame::PullUpChildren(nsIPresContext& aPresContext, if (nsnull == kidFrame) { // No. Any frames on its overflow list? if (nextInFlow->mOverflowFrames.NotEmpty()) { - // XXX use nsFrameList::Join // Move the overflow list to become the child list - nextInFlow->AppendChildren(nextInFlow->mOverflowFrames.FirstChild(), PR_TRUE); - nextInFlow->mOverflowFrames.SetFrames(nsnull); + nextInFlow->mFrames.AppendFrames(nsnull, nextInFlow->mOverflowFrames); kidFrame = nextInFlow->mFrames.FirstChild(); } else { // We've pulled up all the children, so move to the next-in-flow. diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp index c6e061d5e3d..091911e91cb 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp @@ -1154,7 +1154,7 @@ NS_METHOD nsTableOuterFrame::VerifyTree() const void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* aChild) { - NS_PRECONDITION(IsChild(aChild), "bad geometric parent"); + NS_PRECONDITION(mFrames.ContainsFrame(aChild), "bad geometric parent"); nsIFrame* nextInFlow; @@ -1191,7 +1191,6 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, // to capture the next-in-flow's next sibling (in case the // next-in-flow is the last next-in-flow for aChild AND the // next-in-flow is not the last child in parent) - NS_ASSERTION(parent->IsChild(aChild), "screwy flow"); aChild->GetNextSibling(&nextSibling); NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling"); diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp index 3376c23ffed..2ba8ae9805c 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp @@ -1044,7 +1044,7 @@ NS_METHOD nsTableRowFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = RemoveAFrame(objectFrame); + rv = mFrames.RemoveFrame(objectFrame); } break; @@ -1198,7 +1198,7 @@ NS_METHOD nsTableRowFrame::IR_CellRemoved(nsIPresContext& aPresContext, nsTableCellFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("\nRow IR: IR_RowRemoved\n"); - nsresult rv = RemoveAFrame((nsIFrame*)aDeletedFrame); + nsresult rv = mFrames.RemoveFrame((nsIFrame*)aDeletedFrame); if (NS_SUCCEEDED(rv)) { ResetMaxChildHeight(); diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp index b1690cec604..65fc6a3ccfd 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp @@ -1109,7 +1109,7 @@ NS_METHOD nsTableRowGroupFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = RemoveAFrame(objectFrame); + rv = mFrames.RemoveFrame(objectFrame); } break; @@ -1278,7 +1278,7 @@ NS_METHOD nsTableRowGroupFrame::IR_RowRemoved(nsIPresContext& aPresContext, nsTableRowFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("\nTRGF IR: IR_RowRemoved\n"); - nsresult rv = RemoveAFrame((nsIFrame *)aDeletedFrame); + nsresult rv = mFrames.RemoveFrame((nsIFrame *)aDeletedFrame); if (NS_SUCCEEDED(rv)) { aReflowState.tableFrame->InvalidateCellMap(); diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp index 9a3f05485b9..e031149ef47 100644 --- a/mozilla/layout/tables/nsTableColGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp @@ -288,7 +288,7 @@ NS_METHOD nsTableColGroupFrame::IR_TargetIsMe(nsIPresContext& aPresCont else { - rv = RemoveAFrame(objectFrame); + rv = mFrames.RemoveFrame(objectFrame); } break; diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index 491f6131635..8b0f28194b4 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -3163,7 +3163,7 @@ NS_METHOD nsTableFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = RemoveAFrame(objectFrame); + rv = mFrames.RemoveFrame(objectFrame); } break; @@ -3453,7 +3453,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 = RemoveAFrame(aDeletedFrame); + nsresult rv = mFrames.RemoveFrame(aDeletedFrame); InvalidateCellMap(); InvalidateColumnCache(); @@ -3784,10 +3784,8 @@ NS_METHOD nsTableFrame::PullUpChildren(nsIPresContext& aPresContext, if (nsnull == kidFrame) { // No. Any frames on its overflow list? if (nextInFlow->mOverflowFrames.NotEmpty()) { - // XXX use nsFrameList::Join // Move the overflow list to become the child list - nextInFlow->AppendChildren(nextInFlow->mOverflowFrames.FirstChild(), PR_TRUE); - nextInFlow->mOverflowFrames.SetFrames(nsnull); + nextInFlow->mFrames.AppendFrames(nsnull, nextInFlow->mOverflowFrames); kidFrame = nextInFlow->mFrames.FirstChild(); } else { // We've pulled up all the children, so move to the next-in-flow. diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp index c6e061d5e3d..091911e91cb 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.cpp +++ b/mozilla/layout/tables/nsTableOuterFrame.cpp @@ -1154,7 +1154,7 @@ NS_METHOD nsTableOuterFrame::VerifyTree() const void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* aChild) { - NS_PRECONDITION(IsChild(aChild), "bad geometric parent"); + NS_PRECONDITION(mFrames.ContainsFrame(aChild), "bad geometric parent"); nsIFrame* nextInFlow; @@ -1191,7 +1191,6 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, // to capture the next-in-flow's next sibling (in case the // next-in-flow is the last next-in-flow for aChild AND the // next-in-flow is not the last child in parent) - NS_ASSERTION(parent->IsChild(aChild), "screwy flow"); aChild->GetNextSibling(&nextSibling); NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling"); diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index 3376c23ffed..2ba8ae9805c 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -1044,7 +1044,7 @@ NS_METHOD nsTableRowFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = RemoveAFrame(objectFrame); + rv = mFrames.RemoveFrame(objectFrame); } break; @@ -1198,7 +1198,7 @@ NS_METHOD nsTableRowFrame::IR_CellRemoved(nsIPresContext& aPresContext, nsTableCellFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("\nRow IR: IR_RowRemoved\n"); - nsresult rv = RemoveAFrame((nsIFrame*)aDeletedFrame); + nsresult rv = mFrames.RemoveFrame((nsIFrame*)aDeletedFrame); if (NS_SUCCEEDED(rv)) { ResetMaxChildHeight(); diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index b1690cec604..65fc6a3ccfd 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -1109,7 +1109,7 @@ NS_METHOD nsTableRowGroupFrame::IR_TargetIsMe(nsIPresContext& aPresContext, } else { - rv = RemoveAFrame(objectFrame); + rv = mFrames.RemoveFrame(objectFrame); } break; @@ -1278,7 +1278,7 @@ NS_METHOD nsTableRowGroupFrame::IR_RowRemoved(nsIPresContext& aPresContext, nsTableRowFrame * aDeletedFrame) { if (PR_TRUE==gsDebugIR) printf("\nTRGF IR: IR_RowRemoved\n"); - nsresult rv = RemoveAFrame((nsIFrame *)aDeletedFrame); + nsresult rv = mFrames.RemoveFrame((nsIFrame *)aDeletedFrame); if (NS_SUCCEEDED(rv)) { aReflowState.tableFrame->InvalidateCellMap();