mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Changed GetNextInFlow() and GetPrevInFlow() to be pointer arguments and 

not references
This commit is contained in:
troy%netscape.com 1999-02-24 04:48:08 +00:00
Родитель 2058dae033
Коммит 03c5c1f520
51 изменённых файлов: 156 добавлений и 156 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

8
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) {

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

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

4
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) {

10
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
}

2
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

10
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
}

10
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
}

8
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
}

8
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;
}

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

2
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.

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

28
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,

4
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;
}

2
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");
}
}

2
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) {

12
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) {

4
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*);
/**

4
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

4
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) {

10
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
}

2
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

10
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
}

10
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
}

8
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
}

8
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;
}

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

2
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.

28
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,

4
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

4
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;
}

2
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");
}
}

2
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) {

12
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) {

4
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*);
/**

4
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

8
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) {

6
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

2
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

6
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

6
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
}

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

4
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

6
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

2
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

6
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

6
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
}

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

4
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