From cc2323242f9b4892bbdf9de52a48592cc706fb45 Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Wed, 24 Feb 1999 04:48:08 +0000 Subject: [PATCH] Changed GetNextInFlow() and GetPrevInFlow() to be pointer arguments and not references git-svn-id: svn://10.0.0.236/trunk@21702 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsGenericElement.cpp | 2 +- mozilla/layout/base/nsCSSFrameConstructor.cpp | 8 +++--- mozilla/layout/base/public/nsIFrame.h | 4 +-- mozilla/layout/base/src/nsGenericElement.cpp | 2 +- mozilla/layout/generic/nsBlockBandData.cpp | 4 +-- mozilla/layout/generic/nsBlockFrame.cpp | 10 +++---- .../layout/generic/nsBlockReflowContext.cpp | 2 +- mozilla/layout/generic/nsBlockReflowState.cpp | 10 +++---- mozilla/layout/generic/nsBlockReflowState.h | 10 +++---- mozilla/layout/generic/nsContainerFrame.cpp | 8 +++--- mozilla/layout/generic/nsFrame.cpp | 8 +++--- mozilla/layout/generic/nsFrame.h | 4 +-- .../layout/generic/nsHTMLContainerFrame.cpp | 2 +- mozilla/layout/generic/nsIFrame.h | 4 +-- mozilla/layout/generic/nsInlineFrame.cpp | 28 +++++++++---------- mozilla/layout/generic/nsLineLayout.cpp | 4 +-- mozilla/layout/generic/nsPageFrame.cpp | 2 +- .../layout/generic/nsSimplePageSequence.cpp | 2 +- mozilla/layout/generic/nsSplittableFrame.cpp | 12 ++++---- mozilla/layout/generic/nsSplittableFrame.h | 4 +-- mozilla/layout/generic/nsTextFrame.cpp | 4 +-- .../layout/html/base/src/nsBlockBandData.cpp | 4 +-- mozilla/layout/html/base/src/nsBlockFrame.cpp | 10 +++---- .../html/base/src/nsBlockReflowContext.cpp | 2 +- .../html/base/src/nsBlockReflowState.cpp | 10 +++---- .../layout/html/base/src/nsBlockReflowState.h | 10 +++---- .../layout/html/base/src/nsContainerFrame.cpp | 8 +++--- mozilla/layout/html/base/src/nsFrame.cpp | 8 +++--- mozilla/layout/html/base/src/nsFrame.h | 4 +-- .../html/base/src/nsHTMLContainerFrame.cpp | 2 +- .../layout/html/base/src/nsInlineFrame.cpp | 28 +++++++++---------- .../layout/html/base/src/nsInlineReflow.cpp | 4 +-- mozilla/layout/html/base/src/nsLineLayout.cpp | 4 +-- mozilla/layout/html/base/src/nsPageFrame.cpp | 2 +- .../html/base/src/nsSimplePageSequence.cpp | 2 +- .../html/base/src/nsSplittableFrame.cpp | 12 ++++---- .../layout/html/base/src/nsSplittableFrame.h | 4 +-- mozilla/layout/html/base/src/nsTextFrame.cpp | 4 +-- .../html/style/src/nsCSSFrameConstructor.cpp | 8 +++--- .../table/src/BasicTableLayoutStrategy.cpp | 6 ++-- .../table/src/FixedTableLayoutStrategy.cpp | 2 +- .../layout/html/table/src/nsTableFrame.cpp | 6 ++-- .../html/table/src/nsTableOuterFrame.cpp | 6 ++-- .../layout/html/table/src/nsTableRowFrame.cpp | 2 +- .../html/table/src/nsTableRowGroupFrame.cpp | 4 +-- .../tables/BasicTableLayoutStrategy.cpp | 6 ++-- .../tables/FixedTableLayoutStrategy.cpp | 2 +- mozilla/layout/tables/nsTableFrame.cpp | 6 ++-- mozilla/layout/tables/nsTableOuterFrame.cpp | 6 ++-- mozilla/layout/tables/nsTableRowFrame.cpp | 2 +- .../layout/tables/nsTableRowGroupFrame.cpp | 4 +-- 51 files changed, 156 insertions(+), 156 deletions(-) diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index 68a6e155c0e..f4f837cdef8 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -867,7 +867,7 @@ nsGenericElement::RenderFrame() NS_RELEASE(vm); // If frame has a next-in-flow, repaint it too - frame->GetNextInFlow(frame); + frame->GetNextInFlow(&frame); } NS_RELEASE(shell); } diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 05cdf528f5f..65d456ae7ef 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -2765,7 +2765,7 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext, // Get the parent frame's last-in-flow nsIFrame* nextInFlow = parentFrame; while (nsnull != nextInFlow) { - parentFrame->GetNextInFlow(nextInFlow); + parentFrame->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { parentFrame = nextInFlow; } @@ -2852,7 +2852,7 @@ FindPreviousSibling(nsIPresShell* aPresShell, // The frame may have a next-in-flow. Get the last-in-flow nsIFrame* nextInFlow; do { - prevSibling->GetNextInFlow(nextInFlow); + prevSibling->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { prevSibling = nextInFlow; } @@ -2886,7 +2886,7 @@ FindNextSibling(nsIPresShell* aPresShell, // The frame may have a next-in-flow. Get the last-in-flow nsIFrame* nextInFlow; do { - nextSibling->GetNextInFlow(nextInFlow); + nextSibling->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { nextSibling = nextInFlow; } @@ -3137,7 +3137,7 @@ ApplyRenderingChangeToTree(nsIPresContext* aPresContext, viewManager->SetViewOpacity(view, color->mOpacity); viewManager->UpdateView(view, r, NS_VMREFRESH_NO_SYNC); - aFrame->GetNextInFlow(aFrame); + aFrame->GetNextInFlow(&aFrame); } if (nsnull != viewManager) { diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h index 87f29de4180..378809f9e99 100644 --- a/mozilla/layout/base/public/nsIFrame.h +++ b/mozilla/layout/base/public/nsIFrame.h @@ -468,9 +468,9 @@ public: nsIStyleContext* aStyleContext, nsIFrame*& aContinuingFrame) = 0; - NS_IMETHOD GetPrevInFlow(nsIFrame*& aPrevInFlow) const = 0; + NS_IMETHOD GetPrevInFlow(nsIFrame** aPrevInFlow) const = 0; NS_IMETHOD SetPrevInFlow(nsIFrame*) = 0; - NS_IMETHOD GetNextInFlow(nsIFrame*& aNextInFlow) const = 0; + NS_IMETHOD GetNextInFlow(nsIFrame** aNextInFlow) const = 0; NS_IMETHOD SetNextInFlow(nsIFrame*) = 0; NS_IMETHOD AppendToFlow(nsIFrame* aAfterFrame) = 0; diff --git a/mozilla/layout/base/src/nsGenericElement.cpp b/mozilla/layout/base/src/nsGenericElement.cpp index 68a6e155c0e..f4f837cdef8 100644 --- a/mozilla/layout/base/src/nsGenericElement.cpp +++ b/mozilla/layout/base/src/nsGenericElement.cpp @@ -867,7 +867,7 @@ nsGenericElement::RenderFrame() NS_RELEASE(vm); // If frame has a next-in-flow, repaint it too - frame->GetNextInFlow(frame); + frame->GetNextInFlow(&frame); } NS_RELEASE(shell); } diff --git a/mozilla/layout/generic/nsBlockBandData.cpp b/mozilla/layout/generic/nsBlockBandData.cpp index 16ad318c0cc..6f6f5d3d62b 100644 --- a/mozilla/layout/generic/nsBlockBandData.cpp +++ b/mozilla/layout/generic/nsBlockBandData.cpp @@ -251,13 +251,13 @@ nsBlockBandData::GetFrameYMost(nsIFrame* aFrame) // If parent has a prev-in-flow, check there for equality first // before looking upward. nsIFrame* parentPrevInFlow; - parent->GetPrevInFlow(parentPrevInFlow); + parent->GetPrevInFlow(&parentPrevInFlow); while (nsnull != parentPrevInFlow) { if (parentPrevInFlow == spaceFrame) { done = PR_TRUE; break; } - parentPrevInFlow->GetPrevInFlow(parentPrevInFlow); + parentPrevInFlow->GetPrevInFlow(&parentPrevInFlow); } if (!done) { diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index d835c6f8467..89097d3030d 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -282,7 +282,7 @@ nsBlockReflowState::nsBlockReflowState(nsIPresContext& aPresContext, mPresContext = aPresContext; mBlock = (nsBlockFrame*) frame; - mBlock->GetNextInFlow((nsIFrame*&)mNextInFlow); + mBlock->GetNextInFlow((nsIFrame**)&mNextInFlow); mKidXMost = 0; mRunInFromFrame = nsnull; @@ -3645,7 +3645,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext, // Destroy frame; capture its next-in-flow first in case we need // to destroy that too. nsIFrame* nextInFlow; - aDeletedFrame->GetNextInFlow(nextInFlow); + aDeletedFrame->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { aDeletedFrame->BreakFromNextFlow(); } @@ -3804,14 +3804,14 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* nextInFlow; nsBlockFrame* parent; - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow"); nextInFlow->GetParent((nsIFrame**)&parent); // If the next-in-flow has a next-in-flow then delete it, too (and // delete it first). nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); if (nsnull != nextNextInFlow) { parent->DeleteChildsNextInFlow(aPresContext, nextInFlow); } @@ -3850,7 +3850,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nextInFlow->DeleteFrame(aPresContext); #ifdef NS_DEBUG - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_POSTCONDITION(nsnull == nextInFlow, "non null next-in-flow"); #endif } diff --git a/mozilla/layout/generic/nsBlockReflowContext.cpp b/mozilla/layout/generic/nsBlockReflowContext.cpp index bd7f1a01ecc..5e47f080818 100644 --- a/mozilla/layout/generic/nsBlockReflowContext.cpp +++ b/mozilla/layout/generic/nsBlockReflowContext.cpp @@ -215,7 +215,7 @@ nsBlockReflowContext::ReflowBlock(nsIFrame* aFrame, // a next-in-flow where it ends up). if (NS_FRAME_IS_COMPLETE(aFrameReflowStatus)) { nsIFrame* kidNextInFlow; - aFrame->GetNextInFlow(kidNextInFlow); + aFrame->GetNextInFlow(&kidNextInFlow); if (nsnull != kidNextInFlow) { // Remove all of the childs next-in-flows. Make sure that we ask // the right parent to do the removal (it's possible that the diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index d835c6f8467..89097d3030d 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -282,7 +282,7 @@ nsBlockReflowState::nsBlockReflowState(nsIPresContext& aPresContext, mPresContext = aPresContext; mBlock = (nsBlockFrame*) frame; - mBlock->GetNextInFlow((nsIFrame*&)mNextInFlow); + mBlock->GetNextInFlow((nsIFrame**)&mNextInFlow); mKidXMost = 0; mRunInFromFrame = nsnull; @@ -3645,7 +3645,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext, // Destroy frame; capture its next-in-flow first in case we need // to destroy that too. nsIFrame* nextInFlow; - aDeletedFrame->GetNextInFlow(nextInFlow); + aDeletedFrame->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { aDeletedFrame->BreakFromNextFlow(); } @@ -3804,14 +3804,14 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* nextInFlow; nsBlockFrame* parent; - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow"); nextInFlow->GetParent((nsIFrame**)&parent); // If the next-in-flow has a next-in-flow then delete it, too (and // delete it first). nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); if (nsnull != nextNextInFlow) { parent->DeleteChildsNextInFlow(aPresContext, nextInFlow); } @@ -3850,7 +3850,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nextInFlow->DeleteFrame(aPresContext); #ifdef NS_DEBUG - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_POSTCONDITION(nsnull == nextInFlow, "non null next-in-flow"); #endif } diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index d835c6f8467..89097d3030d 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -282,7 +282,7 @@ nsBlockReflowState::nsBlockReflowState(nsIPresContext& aPresContext, mPresContext = aPresContext; mBlock = (nsBlockFrame*) frame; - mBlock->GetNextInFlow((nsIFrame*&)mNextInFlow); + mBlock->GetNextInFlow((nsIFrame**)&mNextInFlow); mKidXMost = 0; mRunInFromFrame = nsnull; @@ -3645,7 +3645,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext, // Destroy frame; capture its next-in-flow first in case we need // to destroy that too. nsIFrame* nextInFlow; - aDeletedFrame->GetNextInFlow(nextInFlow); + aDeletedFrame->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { aDeletedFrame->BreakFromNextFlow(); } @@ -3804,14 +3804,14 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* nextInFlow; nsBlockFrame* parent; - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow"); nextInFlow->GetParent((nsIFrame**)&parent); // If the next-in-flow has a next-in-flow then delete it, too (and // delete it first). nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); if (nsnull != nextNextInFlow) { parent->DeleteChildsNextInFlow(aPresContext, nextInFlow); } @@ -3850,7 +3850,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nextInFlow->DeleteFrame(aPresContext); #ifdef NS_DEBUG - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_POSTCONDITION(nsnull == nextInFlow, "non null next-in-flow"); #endif } diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp index 370ba821ec6..cee194c53ae 100644 --- a/mozilla/layout/generic/nsContainerFrame.cpp +++ b/mozilla/layout/generic/nsContainerFrame.cpp @@ -367,7 +367,7 @@ nsContainerFrame::ReflowChild(nsIFrame* aKidFrame, // next-in-flows if (NS_SUCCEEDED(result) && NS_FRAME_IS_COMPLETE(aStatus)) { nsIFrame* kidNextInFlow; - aKidFrame->GetNextInFlow(kidNextInFlow); + aKidFrame->GetNextInFlow(&kidNextInFlow); if (nsnull != kidNextInFlow) { // Remove all of the childs next-in-flows. Make sure that we ask // the right parent to do the removal (it's possible that the @@ -400,7 +400,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* nextInFlow; nsContainerFrame* parent; - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow"); nextInFlow->GetParent((nsIFrame**)&parent); @@ -408,7 +408,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, // delete it first). nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); if (nsnull != nextNextInFlow) { parent->DeleteChildsNextInFlow(aPresContext, nextInFlow); } @@ -424,7 +424,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nextInFlow->DeleteFrame(aPresContext); #ifdef NS_DEBUG - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_POSTCONDITION(nsnull == nextInFlow, "non null next-in-flow"); #endif } diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 7e152e5fb60..9432984e85f 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -1107,9 +1107,9 @@ NS_IMETHODIMP nsFrame::CreateContinuingFrame(nsIPresContext& aPresContext, return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP nsFrame::GetPrevInFlow(nsIFrame*& aPrevInFlow) const +NS_IMETHODIMP nsFrame::GetPrevInFlow(nsIFrame** aPrevInFlow) const { - aPrevInFlow = nsnull; + *aPrevInFlow = nsnull; return NS_OK; } @@ -1119,9 +1119,9 @@ NS_IMETHODIMP nsFrame::SetPrevInFlow(nsIFrame*) return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP nsFrame::GetNextInFlow(nsIFrame*& aNextInFlow) const +NS_IMETHODIMP nsFrame::GetNextInFlow(nsIFrame** aNextInFlow) const { - aNextInFlow = nsnull; + *aNextInFlow = nsnull; return NS_OK; } diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index 5ef125b8b29..2a567de30a7 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -186,9 +186,9 @@ public: nsIFrame* aParent, nsIStyleContext* aStyleContext, nsIFrame*& aContinuingFrame); - NS_IMETHOD GetPrevInFlow(nsIFrame*& aPrevInFlow) const; + NS_IMETHOD GetPrevInFlow(nsIFrame** aPrevInFlow) const; NS_IMETHOD SetPrevInFlow(nsIFrame*); - NS_IMETHOD GetNextInFlow(nsIFrame*& aNextInFlow) const; + NS_IMETHOD GetNextInFlow(nsIFrame** aNextInFlow) const; NS_IMETHOD SetNextInFlow(nsIFrame*); NS_IMETHOD AppendToFlow(nsIFrame* aAfterFrame); NS_IMETHOD PrependToFlow(nsIFrame* aAfterFrame); diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp index 9c5b60e82ab..c20d17d2a37 100644 --- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp @@ -155,7 +155,7 @@ nsHTMLContainerFrame::CreateNextInFlow(nsIPresContext& aPresContext, aNextInFlowResult = nsnull; nsIFrame* nextInFlow; - aFrame->GetNextInFlow(nextInFlow); + aFrame->GetNextInFlow(&nextInFlow); if (nsnull == nextInFlow) { // Create a continuation frame for the child frame and insert it // into our lines child list. diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index 87f29de4180..378809f9e99 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/layout/generic/nsIFrame.h @@ -468,9 +468,9 @@ public: nsIStyleContext* aStyleContext, nsIFrame*& aContinuingFrame) = 0; - NS_IMETHOD GetPrevInFlow(nsIFrame*& aPrevInFlow) const = 0; + NS_IMETHOD GetPrevInFlow(nsIFrame** aPrevInFlow) const = 0; NS_IMETHOD SetPrevInFlow(nsIFrame*) = 0; - NS_IMETHOD GetNextInFlow(nsIFrame*& aNextInFlow) const = 0; + NS_IMETHOD GetNextInFlow(nsIFrame** aNextInFlow) const = 0; NS_IMETHOD SetNextInFlow(nsIFrame*) = 0; NS_IMETHOD AppendToFlow(nsIFrame* aAfterFrame) = 0; diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp index da77f9d64ed..58c5c15f07f 100644 --- a/mozilla/layout/generic/nsInlineFrame.cpp +++ b/mozilla/layout/generic/nsInlineFrame.cpp @@ -700,7 +700,7 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext, nsInlineFrame* start = this; while (start != flow) { frames.AppendFrames(anonymousBlock, start->mFrames); - start->GetNextInFlow((nsIFrame*&) start); + start->GetNextInFlow((nsIFrame**) &start); } anonymousBlock->InsertFrames2(aPresContext, aPresShell, nsnull, nsnull, frames.FirstChild()); @@ -742,10 +742,10 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext, // inline frames that contain them. nsFrameList frames; nsInlineFrame* start; - flow->GetNextInFlow((nsIFrame*&) start); // start after anon block + flow->GetNextInFlow((nsIFrame**) &start); // start after anon block while (start != prevFrameParent) { frames.AppendFrames(anonymousBlock, start->mFrames); - start->GetNextInFlow((nsIFrame*&) start); + start->GetNextInFlow((nsIFrame**) &start); } // Now append the frames just before and including aPrevFrame @@ -792,10 +792,10 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext, // Gather up all of the inline frames from all of the flow // between the insertion point and the anonymous block. - start->GetNextInFlow((nsIFrame*&) start); + start->GetNextInFlow((nsIFrame**) &start); while (start != flow) { frames.AppendFrames(anonymousBlock, start->mFrames); - start->GetNextInFlow((nsIFrame*&) start); + start->GetNextInFlow((nsIFrame**) &start); } // Now update the anonymous block @@ -878,7 +878,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext, nsIFrame* nextSibling; aPrevFrame->GetNextSibling(&nextSibling); nsIFrame* anonymousBlockNextInFlow; - prevFrameParent->GetNextInFlow(anonymousBlockNextInFlow); + prevFrameParent->GetNextInFlow(&anonymousBlockNextInFlow); if ((nsnull != nextSibling) || (nsnull != anonymousBlockNextInFlow)) { // Easy case: there are more frames following aPrevFrame which // means that this insertion lies in the anonymous block. @@ -996,14 +996,14 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, if (nsLineLayout::TreatFrameAsBlock(aOldFrame)) { // It is possible that we are removing the first block in the // anonymous block or the last block. See if its so. - anonymousBlock->GetPrevInFlow(prevInFlow); + anonymousBlock->GetPrevInFlow(&prevInFlow); nsIFrame* prevSib; if ((nsnull != prevInFlow) || (nsnull != (prevSib = blockKids.GetPrevSiblingFor(aOldFrame)))) { // There is a block in the anonymous block prior to the // block that we are removing. See if we are removing the // last block in the anonymous block. - anonymousBlock->GetNextInFlow(nextInFlow); + anonymousBlock->GetNextInFlow(&nextInFlow); nsIFrame* nextSib; aOldFrame->GetNextSibling(&nextSib); if ((nsnull != nextInFlow) || (nsnull != nextSib)) { @@ -1038,7 +1038,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, } ab->RemoveFirstFrame(); nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); nextInFlow->DeleteFrame(aPresContext); nextInFlow = nextNextInFlow; } @@ -1072,7 +1072,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, inlines.InsertFrames(nsnull, nsnull, kids); } } - anonymousBlock->GetPrevInFlow((nsIFrame*&) anonymousBlock); + anonymousBlock->GetPrevInFlow((nsIFrame**) &anonymousBlock); } // Now we have all of the inline frames that need to be @@ -1104,7 +1104,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, nsInlineFrame* anonymousBlockParent; anonymousBlock->GetParent((nsIFrame**) &anonymousBlockParent); anonymousBlock->RemoveFirstFrame(); - aOldFrame->GetNextInFlow(nextInFlow); + aOldFrame->GetNextInFlow(&nextInFlow); aOldFrame->DeleteFrame(aPresContext); while (nsnull != nextInFlow) { nsIFrame* nextParent; @@ -1114,7 +1114,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, } anonymousBlock->RemoveFirstFrame(); nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); nextInFlow->DeleteFrame(aPresContext); nextInFlow = nextNextInFlow; } @@ -1136,14 +1136,14 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, frames.AppendFrame(nsnull, kid); kid = next; } - anonymousBlock->GetNextInFlow((nsIFrame*&) anonymousBlock); + anonymousBlock->GetNextInFlow((nsIFrame**) &anonymousBlock); } if (frames.NotEmpty()) { // If the anonymousBlockParent has a prev-in-flow then // append the inline frames there, otherwise insert them // before the anonymousBlock. - anonymousBlockParent->GetPrevInFlow(prevInFlow); + anonymousBlockParent->GetPrevInFlow(&prevInFlow); if (nsnull != prevInFlow) { anonymousBlockParent = (nsInlineFrame*) prevInFlow; anonymousBlockParent->mFrames.AppendFrames(anonymousBlockParent, diff --git a/mozilla/layout/generic/nsLineLayout.cpp b/mozilla/layout/generic/nsLineLayout.cpp index 3d9fc3b5b01..9a7cb8d366f 100644 --- a/mozilla/layout/generic/nsLineLayout.cpp +++ b/mozilla/layout/generic/nsLineLayout.cpp @@ -117,7 +117,7 @@ nsLineLayout::FindTextRunFor(nsIFrame* aFrame) // backup from the argument frame to its first-in-flow. for (;;) { nsIFrame* prevInFlow; - aFrame->GetPrevInFlow(prevInFlow); + aFrame->GetPrevInFlow(&prevInFlow); if (nsnull == prevInFlow) { break; } @@ -143,7 +143,7 @@ nsLineLayout::FindNextText(nsIFrame* aFrame) // backup from the argument frame to its first-in-flow. for (;;) { nsIFrame* prevInFlow; - aFrame->GetPrevInFlow(prevInFlow); + aFrame->GetPrevInFlow(&prevInFlow); if (nsnull == prevInFlow) { break; } diff --git a/mozilla/layout/generic/nsPageFrame.cpp b/mozilla/layout/generic/nsPageFrame.cpp index 79897374fcd..b10c5ffe342 100644 --- a/mozilla/layout/generic/nsPageFrame.cpp +++ b/mozilla/layout/generic/nsPageFrame.cpp @@ -124,7 +124,7 @@ NS_METHOD nsPageFrame::Reflow(nsIPresContext& aPresContext, if (NS_FRAME_IS_COMPLETE(aStatus)) { nsIFrame* childNextInFlow; - frame->GetNextInFlow(childNextInFlow); + frame->GetNextInFlow(&childNextInFlow); NS_ASSERTION(nsnull == childNextInFlow, "bad child flow list"); } } diff --git a/mozilla/layout/generic/nsSimplePageSequence.cpp b/mozilla/layout/generic/nsSimplePageSequence.cpp index 14b5db60570..97ec988007f 100644 --- a/mozilla/layout/generic/nsSimplePageSequence.cpp +++ b/mozilla/layout/generic/nsSimplePageSequence.cpp @@ -146,7 +146,7 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext& aPresContext, // Is the page complete? nsIFrame* kidNextInFlow; - kidFrame->GetNextInFlow(kidNextInFlow); + kidFrame->GetNextInFlow(&kidNextInFlow); if (NS_FRAME_IS_COMPLETE(status)) { NS_ASSERTION(nsnull == kidNextInFlow, "bad child flow list"); } else if (nsnull == kidNextInFlow) { diff --git a/mozilla/layout/generic/nsSplittableFrame.cpp b/mozilla/layout/generic/nsSplittableFrame.cpp index 21d98352f5b..024af96cc27 100644 --- a/mozilla/layout/generic/nsSplittableFrame.cpp +++ b/mozilla/layout/generic/nsSplittableFrame.cpp @@ -28,9 +28,9 @@ nsSplittableFrame::IsSplittable(nsSplittableType& aIsSplittable) const return NS_OK; } -NS_METHOD nsSplittableFrame::GetPrevInFlow(nsIFrame*& aPrevInFlow) const +NS_METHOD nsSplittableFrame::GetPrevInFlow(nsIFrame** aPrevInFlow) const { - aPrevInFlow = mPrevInFlow; + *aPrevInFlow = mPrevInFlow; return NS_OK; } @@ -40,9 +40,9 @@ NS_METHOD nsSplittableFrame::SetPrevInFlow(nsIFrame* aFrame) return NS_OK; } -NS_METHOD nsSplittableFrame::GetNextInFlow(nsIFrame*& aNextInFlow) const +NS_METHOD nsSplittableFrame::GetNextInFlow(nsIFrame** aNextInFlow) const { - aNextInFlow = mNextInFlow; + *aNextInFlow = mNextInFlow; return NS_OK; } @@ -82,7 +82,7 @@ NS_METHOD nsSplittableFrame::AppendToFlow(nsIFrame* aAfterFrame) NS_PRECONDITION(aAfterFrame != nsnull, "null pointer"); mPrevInFlow = aAfterFrame; - aAfterFrame->GetNextInFlow(mNextInFlow); + aAfterFrame->GetNextInFlow(&mNextInFlow); mPrevInFlow->SetNextInFlow(this); if (mNextInFlow) { mNextInFlow->SetPrevInFlow(this); @@ -95,7 +95,7 @@ NS_METHOD nsSplittableFrame::PrependToFlow(nsIFrame* aBeforeFrame) { NS_PRECONDITION(aBeforeFrame != nsnull, "null pointer"); - aBeforeFrame->GetPrevInFlow(mPrevInFlow); + aBeforeFrame->GetPrevInFlow(&mPrevInFlow); mNextInFlow = aBeforeFrame; mNextInFlow->SetPrevInFlow(this); if (mPrevInFlow) { diff --git a/mozilla/layout/generic/nsSplittableFrame.h b/mozilla/layout/generic/nsSplittableFrame.h index 68dd0315064..ee5e5ae7604 100644 --- a/mozilla/layout/generic/nsSplittableFrame.h +++ b/mozilla/layout/generic/nsSplittableFrame.h @@ -29,9 +29,9 @@ public: NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const; // Flow member functions. - NS_IMETHOD GetPrevInFlow(nsIFrame*& aPrevInFlow) const; + NS_IMETHOD GetPrevInFlow(nsIFrame** aPrevInFlow) const; NS_IMETHOD SetPrevInFlow(nsIFrame*); - NS_IMETHOD GetNextInFlow(nsIFrame*& aNextInFlow) const; + NS_IMETHOD GetNextInFlow(nsIFrame** aNextInFlow) const; NS_IMETHOD SetNextInFlow(nsIFrame*); /** diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index c1140bc2fee..119edfdfa68 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -1664,7 +1664,7 @@ TextFrame::SetSelectedContentOffsets(PRBool aSelected, PRInt32 aBeginContentOffs do { nextInFlow->SetSelected(PR_FALSE, 0, 0, aForceRedraw); } - while (NS_SUCCEEDED(nextInFlow->GetNextInFlow(nextInFlow)) && nextInFlow);//this is ok because frames arent reference counted this is not a leak! + while (NS_SUCCEEDED(nextInFlow->GetNextInFlow(&nextInFlow)) && nextInFlow);//this is ok because frames arent reference counted this is not a leak! } } else { @@ -2430,7 +2430,7 @@ TextFrame::ComputeTotalWordWidth(nsLineLayout& aLineLayout, // XXX This assumes that a next-in-flow will follow it's // prev-in-flow in the text-run. Maybe not a good assumption? // What if the next-in-flow isn't actually part of the flow? - frame->GetNextInFlow(frame); + frame->GetNextInFlow(&frame); } // Move on to the next frame in the text-run diff --git a/mozilla/layout/html/base/src/nsBlockBandData.cpp b/mozilla/layout/html/base/src/nsBlockBandData.cpp index 16ad318c0cc..6f6f5d3d62b 100644 --- a/mozilla/layout/html/base/src/nsBlockBandData.cpp +++ b/mozilla/layout/html/base/src/nsBlockBandData.cpp @@ -251,13 +251,13 @@ nsBlockBandData::GetFrameYMost(nsIFrame* aFrame) // If parent has a prev-in-flow, check there for equality first // before looking upward. nsIFrame* parentPrevInFlow; - parent->GetPrevInFlow(parentPrevInFlow); + parent->GetPrevInFlow(&parentPrevInFlow); while (nsnull != parentPrevInFlow) { if (parentPrevInFlow == spaceFrame) { done = PR_TRUE; break; } - parentPrevInFlow->GetPrevInFlow(parentPrevInFlow); + parentPrevInFlow->GetPrevInFlow(&parentPrevInFlow); } if (!done) { diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index d835c6f8467..89097d3030d 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -282,7 +282,7 @@ nsBlockReflowState::nsBlockReflowState(nsIPresContext& aPresContext, mPresContext = aPresContext; mBlock = (nsBlockFrame*) frame; - mBlock->GetNextInFlow((nsIFrame*&)mNextInFlow); + mBlock->GetNextInFlow((nsIFrame**)&mNextInFlow); mKidXMost = 0; mRunInFromFrame = nsnull; @@ -3645,7 +3645,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext, // Destroy frame; capture its next-in-flow first in case we need // to destroy that too. nsIFrame* nextInFlow; - aDeletedFrame->GetNextInFlow(nextInFlow); + aDeletedFrame->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { aDeletedFrame->BreakFromNextFlow(); } @@ -3804,14 +3804,14 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* nextInFlow; nsBlockFrame* parent; - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow"); nextInFlow->GetParent((nsIFrame**)&parent); // If the next-in-flow has a next-in-flow then delete it, too (and // delete it first). nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); if (nsnull != nextNextInFlow) { parent->DeleteChildsNextInFlow(aPresContext, nextInFlow); } @@ -3850,7 +3850,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nextInFlow->DeleteFrame(aPresContext); #ifdef NS_DEBUG - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_POSTCONDITION(nsnull == nextInFlow, "non null next-in-flow"); #endif } diff --git a/mozilla/layout/html/base/src/nsBlockReflowContext.cpp b/mozilla/layout/html/base/src/nsBlockReflowContext.cpp index bd7f1a01ecc..5e47f080818 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowContext.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowContext.cpp @@ -215,7 +215,7 @@ nsBlockReflowContext::ReflowBlock(nsIFrame* aFrame, // a next-in-flow where it ends up). if (NS_FRAME_IS_COMPLETE(aFrameReflowStatus)) { nsIFrame* kidNextInFlow; - aFrame->GetNextInFlow(kidNextInFlow); + aFrame->GetNextInFlow(&kidNextInFlow); if (nsnull != kidNextInFlow) { // Remove all of the childs next-in-flows. Make sure that we ask // the right parent to do the removal (it's possible that the diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index d835c6f8467..89097d3030d 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -282,7 +282,7 @@ nsBlockReflowState::nsBlockReflowState(nsIPresContext& aPresContext, mPresContext = aPresContext; mBlock = (nsBlockFrame*) frame; - mBlock->GetNextInFlow((nsIFrame*&)mNextInFlow); + mBlock->GetNextInFlow((nsIFrame**)&mNextInFlow); mKidXMost = 0; mRunInFromFrame = nsnull; @@ -3645,7 +3645,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext, // Destroy frame; capture its next-in-flow first in case we need // to destroy that too. nsIFrame* nextInFlow; - aDeletedFrame->GetNextInFlow(nextInFlow); + aDeletedFrame->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { aDeletedFrame->BreakFromNextFlow(); } @@ -3804,14 +3804,14 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* nextInFlow; nsBlockFrame* parent; - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow"); nextInFlow->GetParent((nsIFrame**)&parent); // If the next-in-flow has a next-in-flow then delete it, too (and // delete it first). nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); if (nsnull != nextNextInFlow) { parent->DeleteChildsNextInFlow(aPresContext, nextInFlow); } @@ -3850,7 +3850,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nextInFlow->DeleteFrame(aPresContext); #ifdef NS_DEBUG - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_POSTCONDITION(nsnull == nextInFlow, "non null next-in-flow"); #endif } diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index d835c6f8467..89097d3030d 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -282,7 +282,7 @@ nsBlockReflowState::nsBlockReflowState(nsIPresContext& aPresContext, mPresContext = aPresContext; mBlock = (nsBlockFrame*) frame; - mBlock->GetNextInFlow((nsIFrame*&)mNextInFlow); + mBlock->GetNextInFlow((nsIFrame**)&mNextInFlow); mKidXMost = 0; mRunInFromFrame = nsnull; @@ -3645,7 +3645,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext, // Destroy frame; capture its next-in-flow first in case we need // to destroy that too. nsIFrame* nextInFlow; - aDeletedFrame->GetNextInFlow(nextInFlow); + aDeletedFrame->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { aDeletedFrame->BreakFromNextFlow(); } @@ -3804,14 +3804,14 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* nextInFlow; nsBlockFrame* parent; - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow"); nextInFlow->GetParent((nsIFrame**)&parent); // If the next-in-flow has a next-in-flow then delete it, too (and // delete it first). nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); if (nsnull != nextNextInFlow) { parent->DeleteChildsNextInFlow(aPresContext, nextInFlow); } @@ -3850,7 +3850,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nextInFlow->DeleteFrame(aPresContext); #ifdef NS_DEBUG - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_POSTCONDITION(nsnull == nextInFlow, "non null next-in-flow"); #endif } diff --git a/mozilla/layout/html/base/src/nsContainerFrame.cpp b/mozilla/layout/html/base/src/nsContainerFrame.cpp index 370ba821ec6..cee194c53ae 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsContainerFrame.cpp @@ -367,7 +367,7 @@ nsContainerFrame::ReflowChild(nsIFrame* aKidFrame, // next-in-flows if (NS_SUCCEEDED(result) && NS_FRAME_IS_COMPLETE(aStatus)) { nsIFrame* kidNextInFlow; - aKidFrame->GetNextInFlow(kidNextInFlow); + aKidFrame->GetNextInFlow(&kidNextInFlow); if (nsnull != kidNextInFlow) { // Remove all of the childs next-in-flows. Make sure that we ask // the right parent to do the removal (it's possible that the @@ -400,7 +400,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsIFrame* nextInFlow; nsContainerFrame* parent; - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow"); nextInFlow->GetParent((nsIFrame**)&parent); @@ -408,7 +408,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, // delete it first). nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); if (nsnull != nextNextInFlow) { parent->DeleteChildsNextInFlow(aPresContext, nextInFlow); } @@ -424,7 +424,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nextInFlow->DeleteFrame(aPresContext); #ifdef NS_DEBUG - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_POSTCONDITION(nsnull == nextInFlow, "non null next-in-flow"); #endif } diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 7e152e5fb60..9432984e85f 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -1107,9 +1107,9 @@ NS_IMETHODIMP nsFrame::CreateContinuingFrame(nsIPresContext& aPresContext, return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP nsFrame::GetPrevInFlow(nsIFrame*& aPrevInFlow) const +NS_IMETHODIMP nsFrame::GetPrevInFlow(nsIFrame** aPrevInFlow) const { - aPrevInFlow = nsnull; + *aPrevInFlow = nsnull; return NS_OK; } @@ -1119,9 +1119,9 @@ NS_IMETHODIMP nsFrame::SetPrevInFlow(nsIFrame*) return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP nsFrame::GetNextInFlow(nsIFrame*& aNextInFlow) const +NS_IMETHODIMP nsFrame::GetNextInFlow(nsIFrame** aNextInFlow) const { - aNextInFlow = nsnull; + *aNextInFlow = nsnull; return NS_OK; } diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index 5ef125b8b29..2a567de30a7 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/layout/html/base/src/nsFrame.h @@ -186,9 +186,9 @@ public: nsIFrame* aParent, nsIStyleContext* aStyleContext, nsIFrame*& aContinuingFrame); - NS_IMETHOD GetPrevInFlow(nsIFrame*& aPrevInFlow) const; + NS_IMETHOD GetPrevInFlow(nsIFrame** aPrevInFlow) const; NS_IMETHOD SetPrevInFlow(nsIFrame*); - NS_IMETHOD GetNextInFlow(nsIFrame*& aNextInFlow) const; + NS_IMETHOD GetNextInFlow(nsIFrame** aNextInFlow) const; NS_IMETHOD SetNextInFlow(nsIFrame*); NS_IMETHOD AppendToFlow(nsIFrame* aAfterFrame); NS_IMETHOD PrependToFlow(nsIFrame* aAfterFrame); diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp index 9c5b60e82ab..c20d17d2a37 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp @@ -155,7 +155,7 @@ nsHTMLContainerFrame::CreateNextInFlow(nsIPresContext& aPresContext, aNextInFlowResult = nsnull; nsIFrame* nextInFlow; - aFrame->GetNextInFlow(nextInFlow); + aFrame->GetNextInFlow(&nextInFlow); if (nsnull == nextInFlow) { // Create a continuation frame for the child frame and insert it // into our lines child list. diff --git a/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp index da77f9d64ed..58c5c15f07f 100644 --- a/mozilla/layout/html/base/src/nsInlineFrame.cpp +++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp @@ -700,7 +700,7 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext, nsInlineFrame* start = this; while (start != flow) { frames.AppendFrames(anonymousBlock, start->mFrames); - start->GetNextInFlow((nsIFrame*&) start); + start->GetNextInFlow((nsIFrame**) &start); } anonymousBlock->InsertFrames2(aPresContext, aPresShell, nsnull, nsnull, frames.FirstChild()); @@ -742,10 +742,10 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext, // inline frames that contain them. nsFrameList frames; nsInlineFrame* start; - flow->GetNextInFlow((nsIFrame*&) start); // start after anon block + flow->GetNextInFlow((nsIFrame**) &start); // start after anon block while (start != prevFrameParent) { frames.AppendFrames(anonymousBlock, start->mFrames); - start->GetNextInFlow((nsIFrame*&) start); + start->GetNextInFlow((nsIFrame**) &start); } // Now append the frames just before and including aPrevFrame @@ -792,10 +792,10 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext, // Gather up all of the inline frames from all of the flow // between the insertion point and the anonymous block. - start->GetNextInFlow((nsIFrame*&) start); + start->GetNextInFlow((nsIFrame**) &start); while (start != flow) { frames.AppendFrames(anonymousBlock, start->mFrames); - start->GetNextInFlow((nsIFrame*&) start); + start->GetNextInFlow((nsIFrame**) &start); } // Now update the anonymous block @@ -878,7 +878,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext, nsIFrame* nextSibling; aPrevFrame->GetNextSibling(&nextSibling); nsIFrame* anonymousBlockNextInFlow; - prevFrameParent->GetNextInFlow(anonymousBlockNextInFlow); + prevFrameParent->GetNextInFlow(&anonymousBlockNextInFlow); if ((nsnull != nextSibling) || (nsnull != anonymousBlockNextInFlow)) { // Easy case: there are more frames following aPrevFrame which // means that this insertion lies in the anonymous block. @@ -996,14 +996,14 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, if (nsLineLayout::TreatFrameAsBlock(aOldFrame)) { // It is possible that we are removing the first block in the // anonymous block or the last block. See if its so. - anonymousBlock->GetPrevInFlow(prevInFlow); + anonymousBlock->GetPrevInFlow(&prevInFlow); nsIFrame* prevSib; if ((nsnull != prevInFlow) || (nsnull != (prevSib = blockKids.GetPrevSiblingFor(aOldFrame)))) { // There is a block in the anonymous block prior to the // block that we are removing. See if we are removing the // last block in the anonymous block. - anonymousBlock->GetNextInFlow(nextInFlow); + anonymousBlock->GetNextInFlow(&nextInFlow); nsIFrame* nextSib; aOldFrame->GetNextSibling(&nextSib); if ((nsnull != nextInFlow) || (nsnull != nextSib)) { @@ -1038,7 +1038,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, } ab->RemoveFirstFrame(); nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); nextInFlow->DeleteFrame(aPresContext); nextInFlow = nextNextInFlow; } @@ -1072,7 +1072,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, inlines.InsertFrames(nsnull, nsnull, kids); } } - anonymousBlock->GetPrevInFlow((nsIFrame*&) anonymousBlock); + anonymousBlock->GetPrevInFlow((nsIFrame**) &anonymousBlock); } // Now we have all of the inline frames that need to be @@ -1104,7 +1104,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, nsInlineFrame* anonymousBlockParent; anonymousBlock->GetParent((nsIFrame**) &anonymousBlockParent); anonymousBlock->RemoveFirstFrame(); - aOldFrame->GetNextInFlow(nextInFlow); + aOldFrame->GetNextInFlow(&nextInFlow); aOldFrame->DeleteFrame(aPresContext); while (nsnull != nextInFlow) { nsIFrame* nextParent; @@ -1114,7 +1114,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, } anonymousBlock->RemoveFirstFrame(); nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); nextInFlow->DeleteFrame(aPresContext); nextInFlow = nextNextInFlow; } @@ -1136,14 +1136,14 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext, frames.AppendFrame(nsnull, kid); kid = next; } - anonymousBlock->GetNextInFlow((nsIFrame*&) anonymousBlock); + anonymousBlock->GetNextInFlow((nsIFrame**) &anonymousBlock); } if (frames.NotEmpty()) { // If the anonymousBlockParent has a prev-in-flow then // append the inline frames there, otherwise insert them // before the anonymousBlock. - anonymousBlockParent->GetPrevInFlow(prevInFlow); + anonymousBlockParent->GetPrevInFlow(&prevInFlow); if (nsnull != prevInFlow) { anonymousBlockParent = (nsInlineFrame*) prevInFlow; anonymousBlockParent->mFrames.AppendFrames(anonymousBlockParent, diff --git a/mozilla/layout/html/base/src/nsInlineReflow.cpp b/mozilla/layout/html/base/src/nsInlineReflow.cpp index f131ba42798..5b128a231de 100644 --- a/mozilla/layout/html/base/src/nsInlineReflow.cpp +++ b/mozilla/layout/html/base/src/nsInlineReflow.cpp @@ -330,7 +330,7 @@ nsInlineReflow::ApplyLeftMargin() case NS_STYLE_FLOAT_NONE: // Only apply left-margin on the first-in flow for inline frames - pfd->mFrame->GetPrevInFlow(prevInFlow); + pfd->mFrame->GetPrevInFlow(&prevInFlow); if (nsnull != prevInFlow) { // Zero this out so that when we compute the max-element-size // of the frame we will properly avoid adding in the left @@ -484,7 +484,7 @@ nsInlineReflow::ReflowFrame(PRBool aIsAdjacentWithTop, // a next-in-flow where it ends up). if (NS_FRAME_IS_COMPLETE(aStatus)) { nsIFrame* kidNextInFlow; - frame->GetNextInFlow(kidNextInFlow); + frame->GetNextInFlow(&kidNextInFlow); if (nsnull != kidNextInFlow) { // Remove all of the childs next-in-flows. Make sure that we ask // the right parent to do the removal (it's possible that the diff --git a/mozilla/layout/html/base/src/nsLineLayout.cpp b/mozilla/layout/html/base/src/nsLineLayout.cpp index 3d9fc3b5b01..9a7cb8d366f 100644 --- a/mozilla/layout/html/base/src/nsLineLayout.cpp +++ b/mozilla/layout/html/base/src/nsLineLayout.cpp @@ -117,7 +117,7 @@ nsLineLayout::FindTextRunFor(nsIFrame* aFrame) // backup from the argument frame to its first-in-flow. for (;;) { nsIFrame* prevInFlow; - aFrame->GetPrevInFlow(prevInFlow); + aFrame->GetPrevInFlow(&prevInFlow); if (nsnull == prevInFlow) { break; } @@ -143,7 +143,7 @@ nsLineLayout::FindNextText(nsIFrame* aFrame) // backup from the argument frame to its first-in-flow. for (;;) { nsIFrame* prevInFlow; - aFrame->GetPrevInFlow(prevInFlow); + aFrame->GetPrevInFlow(&prevInFlow); if (nsnull == prevInFlow) { break; } diff --git a/mozilla/layout/html/base/src/nsPageFrame.cpp b/mozilla/layout/html/base/src/nsPageFrame.cpp index 79897374fcd..b10c5ffe342 100644 --- a/mozilla/layout/html/base/src/nsPageFrame.cpp +++ b/mozilla/layout/html/base/src/nsPageFrame.cpp @@ -124,7 +124,7 @@ NS_METHOD nsPageFrame::Reflow(nsIPresContext& aPresContext, if (NS_FRAME_IS_COMPLETE(aStatus)) { nsIFrame* childNextInFlow; - frame->GetNextInFlow(childNextInFlow); + frame->GetNextInFlow(&childNextInFlow); NS_ASSERTION(nsnull == childNextInFlow, "bad child flow list"); } } diff --git a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp index 14b5db60570..97ec988007f 100644 --- a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp +++ b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp @@ -146,7 +146,7 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext& aPresContext, // Is the page complete? nsIFrame* kidNextInFlow; - kidFrame->GetNextInFlow(kidNextInFlow); + kidFrame->GetNextInFlow(&kidNextInFlow); if (NS_FRAME_IS_COMPLETE(status)) { NS_ASSERTION(nsnull == kidNextInFlow, "bad child flow list"); } else if (nsnull == kidNextInFlow) { diff --git a/mozilla/layout/html/base/src/nsSplittableFrame.cpp b/mozilla/layout/html/base/src/nsSplittableFrame.cpp index 21d98352f5b..024af96cc27 100644 --- a/mozilla/layout/html/base/src/nsSplittableFrame.cpp +++ b/mozilla/layout/html/base/src/nsSplittableFrame.cpp @@ -28,9 +28,9 @@ nsSplittableFrame::IsSplittable(nsSplittableType& aIsSplittable) const return NS_OK; } -NS_METHOD nsSplittableFrame::GetPrevInFlow(nsIFrame*& aPrevInFlow) const +NS_METHOD nsSplittableFrame::GetPrevInFlow(nsIFrame** aPrevInFlow) const { - aPrevInFlow = mPrevInFlow; + *aPrevInFlow = mPrevInFlow; return NS_OK; } @@ -40,9 +40,9 @@ NS_METHOD nsSplittableFrame::SetPrevInFlow(nsIFrame* aFrame) return NS_OK; } -NS_METHOD nsSplittableFrame::GetNextInFlow(nsIFrame*& aNextInFlow) const +NS_METHOD nsSplittableFrame::GetNextInFlow(nsIFrame** aNextInFlow) const { - aNextInFlow = mNextInFlow; + *aNextInFlow = mNextInFlow; return NS_OK; } @@ -82,7 +82,7 @@ NS_METHOD nsSplittableFrame::AppendToFlow(nsIFrame* aAfterFrame) NS_PRECONDITION(aAfterFrame != nsnull, "null pointer"); mPrevInFlow = aAfterFrame; - aAfterFrame->GetNextInFlow(mNextInFlow); + aAfterFrame->GetNextInFlow(&mNextInFlow); mPrevInFlow->SetNextInFlow(this); if (mNextInFlow) { mNextInFlow->SetPrevInFlow(this); @@ -95,7 +95,7 @@ NS_METHOD nsSplittableFrame::PrependToFlow(nsIFrame* aBeforeFrame) { NS_PRECONDITION(aBeforeFrame != nsnull, "null pointer"); - aBeforeFrame->GetPrevInFlow(mPrevInFlow); + aBeforeFrame->GetPrevInFlow(&mPrevInFlow); mNextInFlow = aBeforeFrame; mNextInFlow->SetPrevInFlow(this); if (mPrevInFlow) { diff --git a/mozilla/layout/html/base/src/nsSplittableFrame.h b/mozilla/layout/html/base/src/nsSplittableFrame.h index 68dd0315064..ee5e5ae7604 100644 --- a/mozilla/layout/html/base/src/nsSplittableFrame.h +++ b/mozilla/layout/html/base/src/nsSplittableFrame.h @@ -29,9 +29,9 @@ public: NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const; // Flow member functions. - NS_IMETHOD GetPrevInFlow(nsIFrame*& aPrevInFlow) const; + NS_IMETHOD GetPrevInFlow(nsIFrame** aPrevInFlow) const; NS_IMETHOD SetPrevInFlow(nsIFrame*); - NS_IMETHOD GetNextInFlow(nsIFrame*& aNextInFlow) const; + NS_IMETHOD GetNextInFlow(nsIFrame** aNextInFlow) const; NS_IMETHOD SetNextInFlow(nsIFrame*); /** diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index c1140bc2fee..119edfdfa68 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -1664,7 +1664,7 @@ TextFrame::SetSelectedContentOffsets(PRBool aSelected, PRInt32 aBeginContentOffs do { nextInFlow->SetSelected(PR_FALSE, 0, 0, aForceRedraw); } - while (NS_SUCCEEDED(nextInFlow->GetNextInFlow(nextInFlow)) && nextInFlow);//this is ok because frames arent reference counted this is not a leak! + while (NS_SUCCEEDED(nextInFlow->GetNextInFlow(&nextInFlow)) && nextInFlow);//this is ok because frames arent reference counted this is not a leak! } } else { @@ -2430,7 +2430,7 @@ TextFrame::ComputeTotalWordWidth(nsLineLayout& aLineLayout, // XXX This assumes that a next-in-flow will follow it's // prev-in-flow in the text-run. Maybe not a good assumption? // What if the next-in-flow isn't actually part of the flow? - frame->GetNextInFlow(frame); + frame->GetNextInFlow(&frame); } // Move on to the next frame in the text-run diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 05cdf528f5f..65d456ae7ef 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -2765,7 +2765,7 @@ nsCSSFrameConstructor::ContentAppended(nsIPresContext* aPresContext, // Get the parent frame's last-in-flow nsIFrame* nextInFlow = parentFrame; while (nsnull != nextInFlow) { - parentFrame->GetNextInFlow(nextInFlow); + parentFrame->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { parentFrame = nextInFlow; } @@ -2852,7 +2852,7 @@ FindPreviousSibling(nsIPresShell* aPresShell, // The frame may have a next-in-flow. Get the last-in-flow nsIFrame* nextInFlow; do { - prevSibling->GetNextInFlow(nextInFlow); + prevSibling->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { prevSibling = nextInFlow; } @@ -2886,7 +2886,7 @@ FindNextSibling(nsIPresShell* aPresShell, // The frame may have a next-in-flow. Get the last-in-flow nsIFrame* nextInFlow; do { - nextSibling->GetNextInFlow(nextInFlow); + nextSibling->GetNextInFlow(&nextInFlow); if (nsnull != nextInFlow) { nextSibling = nextInFlow; } @@ -3137,7 +3137,7 @@ ApplyRenderingChangeToTree(nsIPresContext* aPresContext, viewManager->SetViewOpacity(view, color->mOpacity); viewManager->UpdateView(view, r, NS_VMREFRESH_NO_SYNC); - aFrame->GetNextInFlow(aFrame); + aFrame->GetNextInFlow(&aFrame); } if (nsnull != viewManager) { diff --git a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp index 51a74e8427b..59bdf0ce048 100644 --- a/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/BasicTableLayoutStrategy.cpp @@ -112,7 +112,7 @@ PRBool BasicTableLayoutStrategy::Initialize(nsSize* aMaxElementSize, PRInt32 aNu { #ifdef NS_DEBUG nsIFrame *tablePIF=nsnull; - mTableFrame->GetPrevInFlow(tablePIF); + mTableFrame->GetPrevInFlow(&tablePIF); NS_ASSERTION(nsnull==tablePIF, "never ever call me on a continuing frame!"); #endif @@ -175,7 +175,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext *aTableStyl { #ifdef NS_DEBUG nsIFrame *tablePIF=nsnull; - mTableFrame->GetPrevInFlow(tablePIF); + mTableFrame->GetPrevInFlow(&tablePIF); NS_ASSERTION(nsnull==tablePIF, "never ever call me on a continuing frame!"); #endif @@ -1700,7 +1700,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( const nsHTMLReflowSt { #ifdef NS_DEBUG nsIFrame *tablePIF=nsnull; - mTableFrame->GetPrevInFlow(tablePIF); + mTableFrame->GetPrevInFlow(&tablePIF); NS_ASSERTION(nsnull==tablePIF, "never ever call me on a continuing frame!"); #endif diff --git a/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp b/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp index 87b77d9e0e5..1febd8256c5 100644 --- a/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp +++ b/mozilla/layout/html/table/src/FixedTableLayoutStrategy.cpp @@ -50,7 +50,7 @@ PRBool FixedTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext *aTableStyl { #ifdef NS_DEBUG nsIFrame *tablePIF=nsnull; - mTableFrame->GetPrevInFlow(tablePIF); + mTableFrame->GetPrevInFlow(&tablePIF); NS_ASSERTION(nsnull==tablePIF, "never ever call me on a continuing frame!"); #endif diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp index b90e7182550..e589ef47540 100644 --- a/mozilla/layout/html/table/src/nsTableFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableFrame.cpp @@ -3584,7 +3584,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext, if (NS_FRAME_IS_NOT_COMPLETE(aStatus)) { nsIFrame* kidNextInFlow; - kidFrame->GetNextInFlow(kidNextInFlow); + kidFrame->GetNextInFlow(&kidNextInFlow); if (nsnull == kidNextInFlow) { // The child doesn't have a next-in-flow so create a continuing // frame. This hooks the child into the flow @@ -3675,7 +3675,7 @@ NS_METHOD nsTableFrame::PullUpChildren(nsIPresContext& aPresContext, kidFrame = nextInFlow->mFrames.FirstChild(); } else { // We've pulled up all the children, so move to the next-in-flow. - nextInFlow->GetNextInFlow((nsIFrame*&)nextInFlow); + nextInFlow->GetNextInFlow((nsIFrame**)&nextInFlow); continue; } } @@ -3737,7 +3737,7 @@ NS_METHOD nsTableFrame::PullUpChildren(nsIPresContext& aPresContext, // No the child isn't complete nsIFrame* kidNextInFlow; - kidFrame->GetNextInFlow(kidNextInFlow); + kidFrame->GetNextInFlow(&kidNextInFlow); if (nsnull == kidNextInFlow) { // The child doesn't have a next-in-flow so create a // continuing frame. The creation appends it to the flow and diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp index 5b43a3279e5..a2ad92841e7 100644 --- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp @@ -1137,7 +1137,7 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI nsIFrame* nextInFlow; - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow"); nsTableOuterFrame* parent; @@ -1148,7 +1148,7 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI // delete it first). nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); if (nsnull != nextNextInFlow) { parent->DeleteChildsNextInFlow(aPresContext, nextInFlow); } @@ -1182,7 +1182,7 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI nextInFlow->DeleteFrame(aPresContext); #ifdef NS_DEBUG - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_POSTCONDITION(nsnull == nextInFlow, "non null next-in-flow"); #endif } diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp index 2f2340e13db..567948bbcea 100644 --- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp @@ -573,7 +573,7 @@ NS_METHOD nsTableRowFrame::ResizeReflow(nsIPresContext& aPresContext, // Note: we can't do that optimization if our height is constrained or the // cell frame has a next-in-flow nsIFrame* kidNextInFlow; - kidFrame->GetNextInFlow(kidNextInFlow); + kidFrame->GetNextInFlow(&kidNextInFlow); if ((aReflowState.reflowState.availableHeight != NS_UNCONSTRAINEDSIZE) || (availWidth != ((nsTableCellFrame *)kidFrame)->GetPriorAvailWidth()) || (nsnull != kidNextInFlow)) diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp index 736d7bb1d49..6648ee91752 100644 --- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp @@ -449,7 +449,7 @@ NS_METHOD nsTableRowGroupFrame::PullUpAllRowFrames(nsIPresContext& aPresContext) kidFrame = nextInFlow->mFrames.FirstChild(); } else { // We've pulled up all the children, so move to the next-in-flow. - nextInFlow->GetNextInFlow((nsIFrame*&)nextInFlow); + nextInFlow->GetNextInFlow((nsIFrame**)&nextInFlow); continue; } } @@ -769,7 +769,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext, // not already have a next-in-flow is that ReflowMappedChildren() reflows // the row frames with an unconstrained available height nsIFrame* nextInFlow; - rowFrame->GetNextInFlow(nextInFlow); + rowFrame->GetNextInFlow(&nextInFlow); NS_ASSERTION(!nextInFlow, "row frame already has next-in-flow"); #endif // Create a continuing frame, add it to the child list, and then push it diff --git a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp index 51a74e8427b..59bdf0ce048 100644 --- a/mozilla/layout/tables/BasicTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/BasicTableLayoutStrategy.cpp @@ -112,7 +112,7 @@ PRBool BasicTableLayoutStrategy::Initialize(nsSize* aMaxElementSize, PRInt32 aNu { #ifdef NS_DEBUG nsIFrame *tablePIF=nsnull; - mTableFrame->GetPrevInFlow(tablePIF); + mTableFrame->GetPrevInFlow(&tablePIF); NS_ASSERTION(nsnull==tablePIF, "never ever call me on a continuing frame!"); #endif @@ -175,7 +175,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext *aTableStyl { #ifdef NS_DEBUG nsIFrame *tablePIF=nsnull; - mTableFrame->GetPrevInFlow(tablePIF); + mTableFrame->GetPrevInFlow(&tablePIF); NS_ASSERTION(nsnull==tablePIF, "never ever call me on a continuing frame!"); #endif @@ -1700,7 +1700,7 @@ PRBool BasicTableLayoutStrategy::BalanceColumnsConstrained( const nsHTMLReflowSt { #ifdef NS_DEBUG nsIFrame *tablePIF=nsnull; - mTableFrame->GetPrevInFlow(tablePIF); + mTableFrame->GetPrevInFlow(&tablePIF); NS_ASSERTION(nsnull==tablePIF, "never ever call me on a continuing frame!"); #endif diff --git a/mozilla/layout/tables/FixedTableLayoutStrategy.cpp b/mozilla/layout/tables/FixedTableLayoutStrategy.cpp index 87b77d9e0e5..1febd8256c5 100644 --- a/mozilla/layout/tables/FixedTableLayoutStrategy.cpp +++ b/mozilla/layout/tables/FixedTableLayoutStrategy.cpp @@ -50,7 +50,7 @@ PRBool FixedTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext *aTableStyl { #ifdef NS_DEBUG nsIFrame *tablePIF=nsnull; - mTableFrame->GetPrevInFlow(tablePIF); + mTableFrame->GetPrevInFlow(&tablePIF); NS_ASSERTION(nsnull==tablePIF, "never ever call me on a continuing frame!"); #endif diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp index b90e7182550..e589ef47540 100644 --- a/mozilla/layout/tables/nsTableFrame.cpp +++ b/mozilla/layout/tables/nsTableFrame.cpp @@ -3584,7 +3584,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext, if (NS_FRAME_IS_NOT_COMPLETE(aStatus)) { nsIFrame* kidNextInFlow; - kidFrame->GetNextInFlow(kidNextInFlow); + kidFrame->GetNextInFlow(&kidNextInFlow); if (nsnull == kidNextInFlow) { // The child doesn't have a next-in-flow so create a continuing // frame. This hooks the child into the flow @@ -3675,7 +3675,7 @@ NS_METHOD nsTableFrame::PullUpChildren(nsIPresContext& aPresContext, kidFrame = nextInFlow->mFrames.FirstChild(); } else { // We've pulled up all the children, so move to the next-in-flow. - nextInFlow->GetNextInFlow((nsIFrame*&)nextInFlow); + nextInFlow->GetNextInFlow((nsIFrame**)&nextInFlow); continue; } } @@ -3737,7 +3737,7 @@ NS_METHOD nsTableFrame::PullUpChildren(nsIPresContext& aPresContext, // No the child isn't complete nsIFrame* kidNextInFlow; - kidFrame->GetNextInFlow(kidNextInFlow); + kidFrame->GetNextInFlow(&kidNextInFlow); if (nsnull == kidNextInFlow) { // The child doesn't have a next-in-flow so create a // continuing frame. The creation appends it to the flow and diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp index 5b43a3279e5..a2ad92841e7 100644 --- a/mozilla/layout/tables/nsTableOuterFrame.cpp +++ b/mozilla/layout/tables/nsTableOuterFrame.cpp @@ -1137,7 +1137,7 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI nsIFrame* nextInFlow; - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow"); nsTableOuterFrame* parent; @@ -1148,7 +1148,7 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI // delete it first). nsIFrame* nextNextInFlow; - nextInFlow->GetNextInFlow(nextNextInFlow); + nextInFlow->GetNextInFlow(&nextNextInFlow); if (nsnull != nextNextInFlow) { parent->DeleteChildsNextInFlow(aPresContext, nextInFlow); } @@ -1182,7 +1182,7 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI nextInFlow->DeleteFrame(aPresContext); #ifdef NS_DEBUG - aChild->GetNextInFlow(nextInFlow); + aChild->GetNextInFlow(&nextInFlow); NS_POSTCONDITION(nsnull == nextInFlow, "non null next-in-flow"); #endif } diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp index 2f2340e13db..567948bbcea 100644 --- a/mozilla/layout/tables/nsTableRowFrame.cpp +++ b/mozilla/layout/tables/nsTableRowFrame.cpp @@ -573,7 +573,7 @@ NS_METHOD nsTableRowFrame::ResizeReflow(nsIPresContext& aPresContext, // Note: we can't do that optimization if our height is constrained or the // cell frame has a next-in-flow nsIFrame* kidNextInFlow; - kidFrame->GetNextInFlow(kidNextInFlow); + kidFrame->GetNextInFlow(&kidNextInFlow); if ((aReflowState.reflowState.availableHeight != NS_UNCONSTRAINEDSIZE) || (availWidth != ((nsTableCellFrame *)kidFrame)->GetPriorAvailWidth()) || (nsnull != kidNextInFlow)) diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp index 736d7bb1d49..6648ee91752 100644 --- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp +++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp @@ -449,7 +449,7 @@ NS_METHOD nsTableRowGroupFrame::PullUpAllRowFrames(nsIPresContext& aPresContext) kidFrame = nextInFlow->mFrames.FirstChild(); } else { // We've pulled up all the children, so move to the next-in-flow. - nextInFlow->GetNextInFlow((nsIFrame*&)nextInFlow); + nextInFlow->GetNextInFlow((nsIFrame**)&nextInFlow); continue; } } @@ -769,7 +769,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext, // not already have a next-in-flow is that ReflowMappedChildren() reflows // the row frames with an unconstrained available height nsIFrame* nextInFlow; - rowFrame->GetNextInFlow(nextInFlow); + rowFrame->GetNextInFlow(&nextInFlow); NS_ASSERTION(!nextInFlow, "row frame already has next-in-flow"); #endif // Create a continuing frame, add it to the child list, and then push it