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

Changed GetParent() to use ** instead of *&

This commit is contained in:
troy%netscape.com 1999-02-10 01:36:30 +00:00
Родитель 8ec03c0c95
Коммит c85f9efd2a
48 изменённых файлов: 184 добавлений и 180 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
content/base/src/nsStyleContext.cpp
Просмотреть файл

@ -137,7 +137,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
case eStyleUnit_Inherit:
nsIFrame* parentFrame;
aFrame->GetParent(parentFrame); // XXX may not be direct parent...
aFrame->GetParent(&parentFrame); // XXX may not be direct parent...
if (nsnull != parentFrame) {
nsIStyleContext* parentContext;
parentFrame->GetStyleContext(&parentContext);
@ -168,7 +168,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
nscoord baseWidth = 0;
PRBool isBase = PR_FALSE;
nsIFrame* frame;
aFrame->GetParent(frame);
aFrame->GetParent(&frame);
while (nsnull != frame) {
frame->IsPercentageBase(isBase);
if (isBase) {
@ -177,7 +177,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
baseWidth = size.width; // not really width, need to subtract out padding...
break;
}
frame->GetParent(frame);
frame->GetParent(&frame);
}
result = (nscoord)((float)baseWidth * aCoord.GetPercentValue());
}

16
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -975,7 +975,7 @@ nsCSSFrameConstructor::TableProcessChild(nsIPresContext* aPresContext,
childItems.AddChild(aChildFrame);
if (parentDisplay->mDisplay == NS_STYLE_DISPLAY_TABLE) {
nsIFrame* innerFrame;
aParentFrame->GetParent(innerFrame);
aParentFrame->GetParent(&innerFrame);
rv = ConstructFrame(aPresContext, aChildContent, innerFrame, aAbsoluteItems,
childItems, aFixedItems);
} else {
@ -2721,7 +2721,7 @@ nsCSSFrameConstructor::GetAbsoluteContainingBlock(nsIPresContext* aPresContext,
}
// Continue walking up the hierarchy
containingBlock->GetParent(containingBlock);
containingBlock->GetParent(&containingBlock);
}
// If we didn't find an absolutely positioned containing block, then use the
@ -2960,9 +2960,9 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
} else {
// Use the prev sibling if we have it; otherwise use the next sibling
if (nsnull != prevSibling) {
prevSibling->GetParent(parentFrame);
prevSibling->GetParent(&parentFrame);
} else {
nextSibling->GetParent(parentFrame);
nextSibling->GetParent(&parentFrame);
}
}
@ -3065,13 +3065,13 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
// Generate two notifications. First for the absolutely positioned
// frame
nsIFrame* parentFrame;
childFrame->GetParent(parentFrame);
childFrame->GetParent(&parentFrame);
rv = parentFrame->RemoveFrame(*aPresContext, *shell,
nsLayoutAtoms::absoluteList, childFrame);
// Now the placeholder frame
if (nsnull != placeholderFrame) {
placeholderFrame->GetParent(parentFrame);
placeholderFrame->GetParent(&parentFrame);
rv = parentFrame->RemoveFrame(*aPresContext, *shell, nsnull,
placeholderFrame);
}
@ -3079,7 +3079,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
} else {
// Notify the parent frame that it should delete the frame
nsIFrame* parentFrame;
childFrame->GetParent(parentFrame);
childFrame->GetParent(&parentFrame);
rv = parentFrame->RemoveFrame(*aPresContext, *shell, nsnull, childFrame);
}
@ -3467,7 +3467,7 @@ nsCSSFrameConstructor::CantRenderReplacedElement(nsIPresContext* aPresContext,
nsIFrame* parentFrame;
nsresult rv = NS_OK;
aFrame->GetParent(parentFrame);
aFrame->GetParent(&parentFrame);
// Get the content object associated with aFrame
aFrame->GetContent(&content);

2
layout/base/nsPresShell.cpp
Просмотреть файл

@ -1282,7 +1282,7 @@ PresShell::ReconstructFrames(void)
// Get the frame that corresponds to the document element
GetPrimaryFrameFor(rootContent, docElementFrame);
if (nsnull != docElementFrame) {
docElementFrame->GetParent(parentFrame);
docElementFrame->GetParent(&parentFrame);
EnterReflowLock();
rv = mStyleSet->ReconstructFrames(mPresContext, rootContent,

7
layout/base/public/nsIFrame.h
Просмотреть файл

@ -276,13 +276,14 @@ public:
* @see nsISupports#Release()
*/
NS_IMETHOD GetStyleContext(nsIStyleContext** aStyleContext) const = 0;
NS_IMETHOD SetStyleContext(nsIPresContext* aPresContext,
NS_IMETHOD SetStyleContext(nsIPresContext* aPresContext,
nsIStyleContext* aContext) = 0;
/**
* Get the style data associated with this frame.
*/
NS_IMETHOD GetStyleData(nsStyleStructID aSID, const nsStyleStruct*& aStyleStruct) const = 0;
NS_IMETHOD GetStyleData(nsStyleStructID aSID,
const nsStyleStruct*& aStyleStruct) const = 0;
/**
* Re-resolve style context and either reset or re-resolve children.
@ -297,7 +298,7 @@ public:
/**
* Accessor functions for geometric parent
*/
NS_IMETHOD GetParent(nsIFrame*& aParent) const = 0;
NS_IMETHOD GetParent(nsIFrame** aParent) const = 0;
NS_IMETHOD SetParent(const nsIFrame* aParent) = 0;
/**

2
layout/base/src/nsRangeList.cpp
Просмотреть файл

@ -601,7 +601,7 @@ getNextFrame(nsIFrame *aStart)
return result;
}
else
if (NS_FAILED(parent->GetParent(result)) || !result)
if (NS_FAILED(parent->GetParent(&result)) || !result)
return nsnull;
else
parent = result;

6
layout/base/src/nsStyleContext.cpp
Просмотреть файл

@ -137,7 +137,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
case eStyleUnit_Inherit:
nsIFrame* parentFrame;
aFrame->GetParent(parentFrame); // XXX may not be direct parent...
aFrame->GetParent(&parentFrame); // XXX may not be direct parent...
if (nsnull != parentFrame) {
nsIStyleContext* parentContext;
parentFrame->GetStyleContext(&parentContext);
@ -168,7 +168,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
nscoord baseWidth = 0;
PRBool isBase = PR_FALSE;
nsIFrame* frame;
aFrame->GetParent(frame);
aFrame->GetParent(&frame);
while (nsnull != frame) {
frame->IsPercentageBase(isBase);
if (isBase) {
@ -177,7 +177,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
baseWidth = size.width; // not really width, need to subtract out padding...
break;
}
frame->GetParent(frame);
frame->GetParent(&frame);
}
result = (nscoord)((float)baseWidth * aCoord.GetPercentValue());
}

4
layout/generic/nsBlockBandData.cpp
Просмотреть файл

@ -237,7 +237,7 @@ nsBlockBandData::GetFrameYMost(nsIFrame* aFrame)
aFrame->GetRect(r);
nscoord y = r.y;
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
PRBool done = PR_FALSE;
while (!done && (parent != spaceFrame)) {
// If parent has a prev-in-flow, check there for equality first
@ -255,7 +255,7 @@ nsBlockBandData::GetFrameYMost(nsIFrame* aFrame)
if (!done) {
parent->GetOrigin(p);
y += p.y;
parent->GetParent(parent);
parent->GetParent(&parent);
}
}

10
layout/generic/nsBlockFrame.cpp
Просмотреть файл

@ -3451,7 +3451,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
while ((nsnull != line) && (nsnull != aDeletedFrame)) {
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(flow == parent, "messed up delete code");
#endif
NS_FRAME_TRACE(NS_FRAME_TRACE_CHILD_REFLOW,
@ -3535,7 +3535,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// the loop so that we advance to the next parent.
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(parent != flow, "strange continuation");
#endif
break;
@ -3666,7 +3666,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
aChild->GetNextInFlow(nextInFlow);
NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow");
nextInFlow->GetParent((nsIFrame*&)parent);
nextInFlow->GetParent((nsIFrame**)&parent);
// If the next-in-flow has a next-in-flow then delete it, too (and
// delete it first).
@ -3907,7 +3907,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
{
for (;;) {
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent == mBlock) {
nsIFrame* child = mCurrentLine->mFirstChild;
PRInt32 n = mCurrentLine->ChildCount();
@ -4318,7 +4318,7 @@ PRBool
nsBlockFrame::IsChild(nsIFrame* aFrame)
{
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent != (nsIFrame*)this) {
return PR_FALSE;
}

2
layout/generic/nsBlockReflowContext.cpp
Просмотреть файл

@ -185,7 +185,7 @@ nsBlockReflowContext::ReflowBlock(nsIFrame* aFrame,
// parent is not this because we are executing pullup code)
/* XXX promote DeleteChildsNextInFlow to nsIFrame to elminate this cast */
nsHTMLContainerFrame* parent;
aFrame->GetParent((nsIFrame*&) parent);
aFrame->GetParent((nsIFrame**)&parent);
parent->DeleteChildsNextInFlow(mPresContext, aFrame);
}
}

10
layout/generic/nsBlockReflowState.cpp
Просмотреть файл

@ -3451,7 +3451,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
while ((nsnull != line) && (nsnull != aDeletedFrame)) {
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(flow == parent, "messed up delete code");
#endif
NS_FRAME_TRACE(NS_FRAME_TRACE_CHILD_REFLOW,
@ -3535,7 +3535,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// the loop so that we advance to the next parent.
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(parent != flow, "strange continuation");
#endif
break;
@ -3666,7 +3666,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
aChild->GetNextInFlow(nextInFlow);
NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow");
nextInFlow->GetParent((nsIFrame*&)parent);
nextInFlow->GetParent((nsIFrame**)&parent);
// If the next-in-flow has a next-in-flow then delete it, too (and
// delete it first).
@ -3907,7 +3907,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
{
for (;;) {
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent == mBlock) {
nsIFrame* child = mCurrentLine->mFirstChild;
PRInt32 n = mCurrentLine->ChildCount();
@ -4318,7 +4318,7 @@ PRBool
nsBlockFrame::IsChild(nsIFrame* aFrame)
{
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent != (nsIFrame*)this) {
return PR_FALSE;
}

10
layout/generic/nsBlockReflowState.h
Просмотреть файл

@ -3451,7 +3451,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
while ((nsnull != line) && (nsnull != aDeletedFrame)) {
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(flow == parent, "messed up delete code");
#endif
NS_FRAME_TRACE(NS_FRAME_TRACE_CHILD_REFLOW,
@ -3535,7 +3535,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// the loop so that we advance to the next parent.
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(parent != flow, "strange continuation");
#endif
break;
@ -3666,7 +3666,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
aChild->GetNextInFlow(nextInFlow);
NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow");
nextInFlow->GetParent((nsIFrame*&)parent);
nextInFlow->GetParent((nsIFrame**)&parent);
// If the next-in-flow has a next-in-flow then delete it, too (and
// delete it first).
@ -3907,7 +3907,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
{
for (;;) {
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent == mBlock) {
nsIFrame* child = mCurrentLine->mFirstChild;
PRInt32 n = mCurrentLine->ChildCount();
@ -4318,7 +4318,7 @@ PRBool
nsBlockFrame::IsChild(nsIFrame* aFrame)
{
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent != (nsIFrame*)this) {
return PR_FALSE;
}

4
layout/generic/nsContainerFrame.cpp
Просмотреть файл

@ -372,7 +372,7 @@ nsContainerFrame::ReflowChild(nsIFrame* aKidFrame,
// the right parent to do the removal (it's possible that the
// parent is not this because we are executing pullup code)
nsIFrame* parent;
aKidFrame->GetParent(parent);
aKidFrame->GetParent(&parent);
((nsContainerFrame*)parent)->DeleteChildsNextInFlow(aPresContext,
aKidFrame);
}
@ -401,7 +401,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
aChild->GetNextInFlow(nextInFlow);
NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow");
nextInFlow->GetParent((nsIFrame*&)parent);
nextInFlow->GetParent((nsIFrame**)&parent);
// If the next-in-flow has a next-in-flow then delete it, too (and
// delete it first).

15
layout/generic/nsFrame.cpp
Просмотреть файл

@ -291,7 +291,7 @@ nsFrame::InsertFrames(nsIPresContext& aPresContext,
// compatability.
nsIFrame* target = this;
if (nsnull != aPrevFrame) {
aPrevFrame->GetParent(target);
aPrevFrame->GetParent(&target);
}
nsIReflowCommand* reflowCmd = nsnull;
@ -319,7 +319,7 @@ nsFrame::RemoveFrame(nsIPresContext& aPresContext,
#else
#ifdef NS_DEBUG
nsIFrame* parent;
aOldFrame->GetParent(parent);
aOldFrame->GetParent(&parent);
NS_ASSERTION(parent == this, "bad child parent");
#endif
@ -331,7 +331,7 @@ nsFrame::RemoveFrame(nsIPresContext& aPresContext,
// compatability.
nsIFrame* target = this;
if (nsnull != aOldFrame) {
aOldFrame->GetParent(target);
aOldFrame->GetParent(&target);
}
nsIReflowCommand* reflowCmd = nsnull;
@ -470,9 +470,10 @@ NS_IMETHODIMP nsFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
// Geometric parent member functions
NS_IMETHODIMP nsFrame::GetParent(nsIFrame*& aParent) const
NS_IMETHODIMP nsFrame::GetParent(nsIFrame** aParent) const
{
aParent = mParent;
NS_PRECONDITION(nsnull != aParent, "null OUT parameter pointer");
*aParent = mParent;
return NS_OK;
}
@ -1455,7 +1456,7 @@ NS_IMETHODIMP nsFrame::GetParentWithView(nsIFrame*& aParent) const
if (nsnull != parView) {
break;
}
aParent->GetParent(aParent);
aParent->GetParent(&aParent);
}
return NS_OK;
@ -1474,7 +1475,7 @@ NS_IMETHODIMP nsFrame::GetOffsetFromView(nsPoint& aOffset, nsIView*& aView) cons
frame->GetOrigin(origin);
aOffset += origin;
frame->GetParent(frame);
frame->GetParent(&frame);
if (nsnull != frame) {
frame->GetView(aView);
}

2
layout/generic/nsFrame.h
Просмотреть файл

@ -140,7 +140,7 @@ public:
const nsStyleStruct*& aStyleStruct) const;
NS_IMETHOD ReResolveStyleContext(nsIPresContext* aPresContext,
nsIStyleContext* aParentContext);
NS_IMETHOD GetParent(nsIFrame*& aParent) const;
NS_IMETHOD GetParent(nsIFrame** aParent) const;
NS_IMETHOD SetParent(const nsIFrame* aParent);
NS_IMETHOD GetRect(nsRect& aRect) const;
NS_IMETHOD GetOrigin(nsPoint& aPoint) const;

2
layout/generic/nsFrameFrame.cpp
Просмотреть файл

@ -602,7 +602,7 @@ NS_IMETHODIMP
nsHTMLFrameInnerFrame::GetParentContent(nsIContent*& aContent)
{
nsHTMLFrameOuterFrame* parent;
GetParent((nsIFrame*&)parent);
GetParent((nsIFrame**)&parent);
nsIContent* content;
nsresult rv = parent->GetContent(&content);

4
layout/generic/nsFrameSetFrame.cpp
Просмотреть файл

@ -381,7 +381,7 @@ nsHTMLFramesetFrame* nsHTMLFramesetFrame::GetFramesetParent(nsIFrame* aChild)
nsIAtom* tag;
contentParent2->GetTag(tag);
if (nsHTMLAtoms::frameset == tag) {
aChild->GetParent((nsIFrame*&)parent);
aChild->GetParent((nsIFrame**)&parent);
}
NS_IF_RELEASE(tag);
NS_RELEASE(contentParent2);
@ -1593,7 +1593,7 @@ nsHTMLFramesetBorderFrame::HandleEvent(nsIPresContext& aPresContext,
switch (aEvent->message) {
case NS_MOUSE_LEFT_BUTTON_DOWN:
nsHTMLFramesetFrame* parentFrame = nsnull;
GetParent((nsIFrame*&)parentFrame);
GetParent((nsIFrame**)&parentFrame);
parentFrame->StartMouseDrag(aPresContext, this, aEvent);
aEventStatus = nsEventStatus_eConsumeNoDefault;
break;

6
layout/generic/nsHTMLReflowCommand.cpp
Просмотреть файл

@ -102,7 +102,7 @@ NS_IMPL_ISUPPORTS(nsHTMLReflowCommand, kIReflowCommandIID);
nsIFrame* nsHTMLReflowCommand::GetContainingBlock(nsIFrame* aFloater)
{
nsIFrame* containingBlock;
aFloater->GetParent(containingBlock);
aFloater->GetParent(&containingBlock);
return containingBlock;
}
@ -117,12 +117,12 @@ void nsHTMLReflowCommand::BuildPath()
if (NS_STYLE_FLOAT_NONE != display->mFloats) {
mPath.AppendElement((void*)mTargetFrame);
for (nsIFrame* f = GetContainingBlock(mTargetFrame); nsnull != f; f->GetParent(f)) {
for (nsIFrame* f = GetContainingBlock(mTargetFrame); nsnull != f; f->GetParent(&f)) {
mPath.AppendElement((void*)f);
}
} else {
for (nsIFrame* f = mTargetFrame; nsnull != f; f->GetParent(f)) {
for (nsIFrame* f = mTargetFrame; nsnull != f; f->GetParent(&f)) {
mPath.AppendElement((void*)f);
}
}

4
layout/generic/nsHTMLReflowState.cpp
Просмотреть файл

@ -390,13 +390,13 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
placeholderFrame->GetOrigin(placeholderOffset);
nsIFrame* parent;
placeholderFrame->GetParent(parent);
placeholderFrame->GetParent(&parent);
while ((nsnull != parent) && (parent != cbrs->frame)) {
nsPoint origin;
parent->GetOrigin(origin);
placeholderOffset += origin;
parent->GetParent(parent);
parent->GetParent(&parent);
}
// Offsets are relative to the containing block's padding edge, so translate

7
layout/generic/nsIFrame.h
Просмотреть файл

@ -276,13 +276,14 @@ public:
* @see nsISupports#Release()
*/
NS_IMETHOD GetStyleContext(nsIStyleContext** aStyleContext) const = 0;
NS_IMETHOD SetStyleContext(nsIPresContext* aPresContext,
NS_IMETHOD SetStyleContext(nsIPresContext* aPresContext,
nsIStyleContext* aContext) = 0;
/**
* Get the style data associated with this frame.
*/
NS_IMETHOD GetStyleData(nsStyleStructID aSID, const nsStyleStruct*& aStyleStruct) const = 0;
NS_IMETHOD GetStyleData(nsStyleStructID aSID,
const nsStyleStruct*& aStyleStruct) const = 0;
/**
* Re-resolve style context and either reset or re-resolve children.
@ -297,7 +298,7 @@ public:
/**
* Accessor functions for geometric parent
*/
NS_IMETHOD GetParent(nsIFrame*& aParent) const = 0;
NS_IMETHOD GetParent(nsIFrame** aParent) const = 0;
NS_IMETHOD SetParent(const nsIFrame* aParent) = 0;
/**

16
layout/generic/nsInlineFrame.cpp
Просмотреть файл

@ -159,7 +159,7 @@ protected:
static PRBool ParentIsInlineFrame(nsIFrame* aFrame, nsIFrame** aParent) {
void* tmp;
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
*aParent = parent;
if (NS_SUCCEEDED(parent->QueryInterface(kInlineFrameCID, &tmp))) {
return PR_TRUE;
@ -708,7 +708,7 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext,
else {
// First see if the insertion is inside the anonymous block
nsIFrame* prevFrameParent;
aPrevFrame->GetParent(prevFrameParent);
aPrevFrame->GetParent(&prevFrameParent);
if (nsLineLayout::TreatFrameAsBlock(prevFrameParent)) {
// The previous frame's parent is an anonymous block. This means
// that the new block frames can be safely inserted there.
@ -862,7 +862,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
}
else {
nsIFrame* prevFrameParent;
aPrevFrame->GetParent(prevFrameParent);
aPrevFrame->GetParent(&prevFrameParent);
if (nsLineLayout::TreatFrameAsBlock(prevFrameParent)) {
nsAnonymousBlockFrame* anonymousBlock;
anonymousBlock = (nsAnonymousBlockFrame*) prevFrameParent;
@ -893,7 +893,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
// aPrevFrame is the last frame that should be in the
// anonymous block.
nsInlineFrame* anonymousBlockParent;
anonymousBlock->GetParent((nsIFrame*&)anonymousBlockParent);
anonymousBlock->GetParent((nsIFrame**)&anonymousBlockParent);
// Place the inline frames after the anonymous block
nsIFrame* frame = aFrameList;
@ -1022,13 +1022,13 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
// First get the last frame out of the picture; delete any
// continuations it might have.
nsInlineFrame* anonymousBlockParent;
anonymousBlock->GetParent((nsIFrame*&) anonymousBlockParent);
anonymousBlock->GetParent((nsIFrame**) &anonymousBlockParent);
nsAnonymousBlockFrame* ab = anonymousBlock;
anonymousBlock->RemoveFramesFrom(aOldFrame);
aOldFrame->DeleteFrame(aPresContext);
while (nsnull != nextInFlow) {
nsIFrame* nextParent;
nextInFlow->GetParent(nextParent);
nextInFlow->GetParent(&nextParent);
if (nextParent != ab) {
ab = (nsAnonymousBlockFrame*) nextParent;
}
@ -1098,13 +1098,13 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
// is the frame we are trying to remove). Make sure we
// remove aOldFrame's continuations if it has any...
nsInlineFrame* anonymousBlockParent;
anonymousBlock->GetParent((nsIFrame*&) anonymousBlockParent);
anonymousBlock->GetParent((nsIFrame**) &anonymousBlockParent);
anonymousBlock->RemoveFirstFrame();
aOldFrame->GetNextInFlow(nextInFlow);
aOldFrame->DeleteFrame(aPresContext);
while (nsnull != nextInFlow) {
nsIFrame* nextParent;
nextInFlow->GetParent(nextParent);
nextInFlow->GetParent(&nextParent);
if (nextParent != anonymousBlock) {
anonymousBlock = (nsAnonymousBlockFrame*) nextParent;
}

4
layout/html/base/src/nsBlockBandData.cpp
Просмотреть файл

@ -237,7 +237,7 @@ nsBlockBandData::GetFrameYMost(nsIFrame* aFrame)
aFrame->GetRect(r);
nscoord y = r.y;
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
PRBool done = PR_FALSE;
while (!done && (parent != spaceFrame)) {
// If parent has a prev-in-flow, check there for equality first
@ -255,7 +255,7 @@ nsBlockBandData::GetFrameYMost(nsIFrame* aFrame)
if (!done) {
parent->GetOrigin(p);
y += p.y;
parent->GetParent(parent);
parent->GetParent(&parent);
}
}

10
layout/html/base/src/nsBlockFrame.cpp
Просмотреть файл

@ -3451,7 +3451,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
while ((nsnull != line) && (nsnull != aDeletedFrame)) {
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(flow == parent, "messed up delete code");
#endif
NS_FRAME_TRACE(NS_FRAME_TRACE_CHILD_REFLOW,
@ -3535,7 +3535,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// the loop so that we advance to the next parent.
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(parent != flow, "strange continuation");
#endif
break;
@ -3666,7 +3666,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
aChild->GetNextInFlow(nextInFlow);
NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow");
nextInFlow->GetParent((nsIFrame*&)parent);
nextInFlow->GetParent((nsIFrame**)&parent);
// If the next-in-flow has a next-in-flow then delete it, too (and
// delete it first).
@ -3907,7 +3907,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
{
for (;;) {
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent == mBlock) {
nsIFrame* child = mCurrentLine->mFirstChild;
PRInt32 n = mCurrentLine->ChildCount();
@ -4318,7 +4318,7 @@ PRBool
nsBlockFrame::IsChild(nsIFrame* aFrame)
{
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent != (nsIFrame*)this) {
return PR_FALSE;
}

2
layout/html/base/src/nsBlockReflowContext.cpp
Просмотреть файл

@ -185,7 +185,7 @@ nsBlockReflowContext::ReflowBlock(nsIFrame* aFrame,
// parent is not this because we are executing pullup code)
/* XXX promote DeleteChildsNextInFlow to nsIFrame to elminate this cast */
nsHTMLContainerFrame* parent;
aFrame->GetParent((nsIFrame*&) parent);
aFrame->GetParent((nsIFrame**)&parent);
parent->DeleteChildsNextInFlow(mPresContext, aFrame);
}
}

10
layout/html/base/src/nsBlockReflowState.cpp
Просмотреть файл

@ -3451,7 +3451,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
while ((nsnull != line) && (nsnull != aDeletedFrame)) {
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(flow == parent, "messed up delete code");
#endif
NS_FRAME_TRACE(NS_FRAME_TRACE_CHILD_REFLOW,
@ -3535,7 +3535,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// the loop so that we advance to the next parent.
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(parent != flow, "strange continuation");
#endif
break;
@ -3666,7 +3666,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
aChild->GetNextInFlow(nextInFlow);
NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow");
nextInFlow->GetParent((nsIFrame*&)parent);
nextInFlow->GetParent((nsIFrame**)&parent);
// If the next-in-flow has a next-in-flow then delete it, too (and
// delete it first).
@ -3907,7 +3907,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
{
for (;;) {
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent == mBlock) {
nsIFrame* child = mCurrentLine->mFirstChild;
PRInt32 n = mCurrentLine->ChildCount();
@ -4318,7 +4318,7 @@ PRBool
nsBlockFrame::IsChild(nsIFrame* aFrame)
{
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent != (nsIFrame*)this) {
return PR_FALSE;
}

10
layout/html/base/src/nsBlockReflowState.h
Просмотреть файл

@ -3451,7 +3451,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
while ((nsnull != line) && (nsnull != aDeletedFrame)) {
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(flow == parent, "messed up delete code");
#endif
NS_FRAME_TRACE(NS_FRAME_TRACE_CHILD_REFLOW,
@ -3535,7 +3535,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// the loop so that we advance to the next parent.
#ifdef NS_DEBUG
nsIFrame* parent;
aDeletedFrame->GetParent(parent);
aDeletedFrame->GetParent(&parent);
NS_ASSERTION(parent != flow, "strange continuation");
#endif
break;
@ -3666,7 +3666,7 @@ nsBlockFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
aChild->GetNextInFlow(nextInFlow);
NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow");
nextInFlow->GetParent((nsIFrame*&)parent);
nextInFlow->GetParent((nsIFrame**)&parent);
// If the next-in-flow has a next-in-flow then delete it, too (and
// delete it first).
@ -3907,7 +3907,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
{
for (;;) {
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent == mBlock) {
nsIFrame* child = mCurrentLine->mFirstChild;
PRInt32 n = mCurrentLine->ChildCount();
@ -4318,7 +4318,7 @@ PRBool
nsBlockFrame::IsChild(nsIFrame* aFrame)
{
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
if (parent != (nsIFrame*)this) {
return PR_FALSE;
}

4
layout/html/base/src/nsContainerFrame.cpp
Просмотреть файл

@ -372,7 +372,7 @@ nsContainerFrame::ReflowChild(nsIFrame* aKidFrame,
// the right parent to do the removal (it's possible that the
// parent is not this because we are executing pullup code)
nsIFrame* parent;
aKidFrame->GetParent(parent);
aKidFrame->GetParent(&parent);
((nsContainerFrame*)parent)->DeleteChildsNextInFlow(aPresContext,
aKidFrame);
}
@ -401,7 +401,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
aChild->GetNextInFlow(nextInFlow);
NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow");
nextInFlow->GetParent((nsIFrame*&)parent);
nextInFlow->GetParent((nsIFrame**)&parent);
// If the next-in-flow has a next-in-flow then delete it, too (and
// delete it first).

15
layout/html/base/src/nsFrame.cpp
Просмотреть файл

@ -291,7 +291,7 @@ nsFrame::InsertFrames(nsIPresContext& aPresContext,
// compatability.
nsIFrame* target = this;
if (nsnull != aPrevFrame) {
aPrevFrame->GetParent(target);
aPrevFrame->GetParent(&target);
}
nsIReflowCommand* reflowCmd = nsnull;
@ -319,7 +319,7 @@ nsFrame::RemoveFrame(nsIPresContext& aPresContext,
#else
#ifdef NS_DEBUG
nsIFrame* parent;
aOldFrame->GetParent(parent);
aOldFrame->GetParent(&parent);
NS_ASSERTION(parent == this, "bad child parent");
#endif
@ -331,7 +331,7 @@ nsFrame::RemoveFrame(nsIPresContext& aPresContext,
// compatability.
nsIFrame* target = this;
if (nsnull != aOldFrame) {
aOldFrame->GetParent(target);
aOldFrame->GetParent(&target);
}
nsIReflowCommand* reflowCmd = nsnull;
@ -470,9 +470,10 @@ NS_IMETHODIMP nsFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
// Geometric parent member functions
NS_IMETHODIMP nsFrame::GetParent(nsIFrame*& aParent) const
NS_IMETHODIMP nsFrame::GetParent(nsIFrame** aParent) const
{
aParent = mParent;
NS_PRECONDITION(nsnull != aParent, "null OUT parameter pointer");
*aParent = mParent;
return NS_OK;
}
@ -1455,7 +1456,7 @@ NS_IMETHODIMP nsFrame::GetParentWithView(nsIFrame*& aParent) const
if (nsnull != parView) {
break;
}
aParent->GetParent(aParent);
aParent->GetParent(&aParent);
}
return NS_OK;
@ -1474,7 +1475,7 @@ NS_IMETHODIMP nsFrame::GetOffsetFromView(nsPoint& aOffset, nsIView*& aView) cons
frame->GetOrigin(origin);
aOffset += origin;
frame->GetParent(frame);
frame->GetParent(&frame);
if (nsnull != frame) {
frame->GetView(aView);
}

2
layout/html/base/src/nsFrame.h
Просмотреть файл

@ -140,7 +140,7 @@ public:
const nsStyleStruct*& aStyleStruct) const;
NS_IMETHOD ReResolveStyleContext(nsIPresContext* aPresContext,
nsIStyleContext* aParentContext);
NS_IMETHOD GetParent(nsIFrame*& aParent) const;
NS_IMETHOD GetParent(nsIFrame** aParent) const;
NS_IMETHOD SetParent(const nsIFrame* aParent);
NS_IMETHOD GetRect(nsRect& aRect) const;
NS_IMETHOD GetOrigin(nsPoint& aPoint) const;

2
layout/html/base/src/nsFrameList.cpp
Просмотреть файл

@ -339,7 +339,7 @@ nsFrameList::VerifyParent(nsIFrame* aParent) const
nsIFrame* frame = mFirstChild;
while (nsnull != frame) {
nsIFrame* parent;
frame->GetParent(parent);
frame->GetParent(&parent);
NS_ASSERTION(parent == aParent, "bad parent");
frame->GetNextSibling(frame);
}

6
layout/html/base/src/nsHTMLReflowCommand.cpp
Просмотреть файл

@ -102,7 +102,7 @@ NS_IMPL_ISUPPORTS(nsHTMLReflowCommand, kIReflowCommandIID);
nsIFrame* nsHTMLReflowCommand::GetContainingBlock(nsIFrame* aFloater)
{
nsIFrame* containingBlock;
aFloater->GetParent(containingBlock);
aFloater->GetParent(&containingBlock);
return containingBlock;
}
@ -117,12 +117,12 @@ void nsHTMLReflowCommand::BuildPath()
if (NS_STYLE_FLOAT_NONE != display->mFloats) {
mPath.AppendElement((void*)mTargetFrame);
for (nsIFrame* f = GetContainingBlock(mTargetFrame); nsnull != f; f->GetParent(f)) {
for (nsIFrame* f = GetContainingBlock(mTargetFrame); nsnull != f; f->GetParent(&f)) {
mPath.AppendElement((void*)f);
}
} else {
for (nsIFrame* f = mTargetFrame; nsnull != f; f->GetParent(f)) {
for (nsIFrame* f = mTargetFrame; nsnull != f; f->GetParent(&f)) {
mPath.AppendElement((void*)f);
}
}

4
layout/html/base/src/nsHTMLReflowState.cpp
Просмотреть файл

@ -390,13 +390,13 @@ nsHTMLReflowState::InitAbsoluteConstraints(nsIPresContext& aPresContext,
placeholderFrame->GetOrigin(placeholderOffset);
nsIFrame* parent;
placeholderFrame->GetParent(parent);
placeholderFrame->GetParent(&parent);
while ((nsnull != parent) && (parent != cbrs->frame)) {
nsPoint origin;
parent->GetOrigin(origin);
placeholderOffset += origin;
parent->GetParent(parent);
parent->GetParent(&parent);
}
// Offsets are relative to the containing block's padding edge, so translate

16
layout/html/base/src/nsInlineFrame.cpp
Просмотреть файл

@ -159,7 +159,7 @@ protected:
static PRBool ParentIsInlineFrame(nsIFrame* aFrame, nsIFrame** aParent) {
void* tmp;
nsIFrame* parent;
aFrame->GetParent(parent);
aFrame->GetParent(&parent);
*aParent = parent;
if (NS_SUCCEEDED(parent->QueryInterface(kInlineFrameCID, &tmp))) {
return PR_TRUE;
@ -708,7 +708,7 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext,
else {
// First see if the insertion is inside the anonymous block
nsIFrame* prevFrameParent;
aPrevFrame->GetParent(prevFrameParent);
aPrevFrame->GetParent(&prevFrameParent);
if (nsLineLayout::TreatFrameAsBlock(prevFrameParent)) {
// The previous frame's parent is an anonymous block. This means
// that the new block frames can be safely inserted there.
@ -862,7 +862,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
}
else {
nsIFrame* prevFrameParent;
aPrevFrame->GetParent(prevFrameParent);
aPrevFrame->GetParent(&prevFrameParent);
if (nsLineLayout::TreatFrameAsBlock(prevFrameParent)) {
nsAnonymousBlockFrame* anonymousBlock;
anonymousBlock = (nsAnonymousBlockFrame*) prevFrameParent;
@ -893,7 +893,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
// aPrevFrame is the last frame that should be in the
// anonymous block.
nsInlineFrame* anonymousBlockParent;
anonymousBlock->GetParent((nsIFrame*&)anonymousBlockParent);
anonymousBlock->GetParent((nsIFrame**)&anonymousBlockParent);
// Place the inline frames after the anonymous block
nsIFrame* frame = aFrameList;
@ -1022,13 +1022,13 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
// First get the last frame out of the picture; delete any
// continuations it might have.
nsInlineFrame* anonymousBlockParent;
anonymousBlock->GetParent((nsIFrame*&) anonymousBlockParent);
anonymousBlock->GetParent((nsIFrame**) &anonymousBlockParent);
nsAnonymousBlockFrame* ab = anonymousBlock;
anonymousBlock->RemoveFramesFrom(aOldFrame);
aOldFrame->DeleteFrame(aPresContext);
while (nsnull != nextInFlow) {
nsIFrame* nextParent;
nextInFlow->GetParent(nextParent);
nextInFlow->GetParent(&nextParent);
if (nextParent != ab) {
ab = (nsAnonymousBlockFrame*) nextParent;
}
@ -1098,13 +1098,13 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
// is the frame we are trying to remove). Make sure we
// remove aOldFrame's continuations if it has any...
nsInlineFrame* anonymousBlockParent;
anonymousBlock->GetParent((nsIFrame*&) anonymousBlockParent);
anonymousBlock->GetParent((nsIFrame**) &anonymousBlockParent);
anonymousBlock->RemoveFirstFrame();
aOldFrame->GetNextInFlow(nextInFlow);
aOldFrame->DeleteFrame(aPresContext);
while (nsnull != nextInFlow) {
nsIFrame* nextParent;
nextInFlow->GetParent(nextParent);
nextInFlow->GetParent(&nextParent);
if (nextParent != anonymousBlock) {
anonymousBlock = (nsAnonymousBlockFrame*) nextParent;
}

2
layout/html/base/src/nsInlineReflow.cpp
Просмотреть файл

@ -480,7 +480,7 @@ nsInlineReflow::ReflowFrame(PRBool aIsAdjacentWithTop,
// the right parent to do the removal (it's possible that the
// parent is not this because we are executing pullup code)
nsHTMLContainerFrame* parent;
frame->GetParent((nsIFrame*&) parent);
frame->GetParent((nsIFrame**) &parent);
parent->DeleteChildsNextInFlow(mPresContext, frame);
}
}

2
layout/html/base/src/nsPresShell.cpp
Просмотреть файл

@ -1282,7 +1282,7 @@ PresShell::ReconstructFrames(void)
// Get the frame that corresponds to the document element
GetPrimaryFrameFor(rootContent, docElementFrame);
if (nsnull != docElementFrame) {
docElementFrame->GetParent(parentFrame);
docElementFrame->GetParent(&parentFrame);
EnterReflowLock();
rv = mStyleSet->ReconstructFrames(mPresContext, rootContent,

2
layout/html/document/src/nsFrameFrame.cpp
Просмотреть файл

@ -602,7 +602,7 @@ NS_IMETHODIMP
nsHTMLFrameInnerFrame::GetParentContent(nsIContent*& aContent)
{
nsHTMLFrameOuterFrame* parent;
GetParent((nsIFrame*&)parent);
GetParent((nsIFrame**)&parent);
nsIContent* content;
nsresult rv = parent->GetContent(&content);

4
layout/html/document/src/nsFrameSetFrame.cpp
Просмотреть файл

@ -381,7 +381,7 @@ nsHTMLFramesetFrame* nsHTMLFramesetFrame::GetFramesetParent(nsIFrame* aChild)
nsIAtom* tag;
contentParent2->GetTag(tag);
if (nsHTMLAtoms::frameset == tag) {
aChild->GetParent((nsIFrame*&)parent);
aChild->GetParent((nsIFrame**)&parent);
}
NS_IF_RELEASE(tag);
NS_RELEASE(contentParent2);
@ -1593,7 +1593,7 @@ nsHTMLFramesetBorderFrame::HandleEvent(nsIPresContext& aPresContext,
switch (aEvent->message) {
case NS_MOUSE_LEFT_BUTTON_DOWN:
nsHTMLFramesetFrame* parentFrame = nsnull;
GetParent((nsIFrame*&)parentFrame);
GetParent((nsIFrame**)&parentFrame);
parentFrame->StartMouseDrag(aPresContext, this, aEvent);
aEventStatus = nsEventStatus_eConsumeNoDefault;
break;

16
layout/html/style/src/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -975,7 +975,7 @@ nsCSSFrameConstructor::TableProcessChild(nsIPresContext* aPresContext,
childItems.AddChild(aChildFrame);
if (parentDisplay->mDisplay == NS_STYLE_DISPLAY_TABLE) {
nsIFrame* innerFrame;
aParentFrame->GetParent(innerFrame);
aParentFrame->GetParent(&innerFrame);
rv = ConstructFrame(aPresContext, aChildContent, innerFrame, aAbsoluteItems,
childItems, aFixedItems);
} else {
@ -2721,7 +2721,7 @@ nsCSSFrameConstructor::GetAbsoluteContainingBlock(nsIPresContext* aPresContext,
}
// Continue walking up the hierarchy
containingBlock->GetParent(containingBlock);
containingBlock->GetParent(&containingBlock);
}
// If we didn't find an absolutely positioned containing block, then use the
@ -2960,9 +2960,9 @@ nsCSSFrameConstructor::ContentInserted(nsIPresContext* aPresContext,
} else {
// Use the prev sibling if we have it; otherwise use the next sibling
if (nsnull != prevSibling) {
prevSibling->GetParent(parentFrame);
prevSibling->GetParent(&parentFrame);
} else {
nextSibling->GetParent(parentFrame);
nextSibling->GetParent(&parentFrame);
}
}
@ -3065,13 +3065,13 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
// Generate two notifications. First for the absolutely positioned
// frame
nsIFrame* parentFrame;
childFrame->GetParent(parentFrame);
childFrame->GetParent(&parentFrame);
rv = parentFrame->RemoveFrame(*aPresContext, *shell,
nsLayoutAtoms::absoluteList, childFrame);
// Now the placeholder frame
if (nsnull != placeholderFrame) {
placeholderFrame->GetParent(parentFrame);
placeholderFrame->GetParent(&parentFrame);
rv = parentFrame->RemoveFrame(*aPresContext, *shell, nsnull,
placeholderFrame);
}
@ -3079,7 +3079,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIPresContext* aPresContext,
} else {
// Notify the parent frame that it should delete the frame
nsIFrame* parentFrame;
childFrame->GetParent(parentFrame);
childFrame->GetParent(&parentFrame);
rv = parentFrame->RemoveFrame(*aPresContext, *shell, nsnull, childFrame);
}
@ -3467,7 +3467,7 @@ nsCSSFrameConstructor::CantRenderReplacedElement(nsIPresContext* aPresContext,
nsIFrame* parentFrame;
nsresult rv = NS_OK;
aFrame->GetParent(parentFrame);
aFrame->GetParent(&parentFrame);
// Get the content object associated with aFrame
aFrame->GetContent(&content);

2
layout/html/table/src/nsTableCellFrame.h
Просмотреть файл

@ -214,7 +214,7 @@ public:
inline PRInt32 nsTableCellFrame::GetRowIndex()
{
nsTableRowFrame * row;
GetParent((nsIFrame *&)row);
GetParent((nsIFrame **)&row);
if (nsnull!=row)
return row->GetRowIndex();
else

46
layout/html/table/src/nsTableFrame.cpp
Просмотреть файл

@ -708,12 +708,12 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
// first, need to get the nearest containing content object
GetContent(&lastColGroupElement); // ADDREF a: lastColGroupElement++ (either here or in the loop below)
nsIFrame *parentFrame;
GetParent(parentFrame);
GetParent(&parentFrame);
while (nsnull==lastColGroupElement)
{
parentFrame->GetContent(&lastColGroupElement);
if (nsnull==lastColGroupElement)
parentFrame->GetParent(parentFrame);
parentFrame->GetParent(&parentFrame);
}
// now we have a ref-counted "lastColGroupElement" content object
nsIStyleContext* colGroupStyleContext =
@ -970,7 +970,7 @@ void nsTableFrame::DumpCellMap ()
{
nsTableCellFrame *cell = cd->mRealCell->mCell;
nsTableRowFrame *row;
cell->GetParent((nsIFrame *&)row);
cell->GetParent((nsIFrame **)&row);
int rr = row->GetRowIndex ();
int cc = cell->GetColIndex ();
printf("S%d,%d ", rr, cc);
@ -978,7 +978,7 @@ void nsTableFrame::DumpCellMap ()
{
cell = cd->mOverlap->mCell;
nsTableRowFrame* row2;
cell->GetParent((nsIFrame *&)row2);
cell->GetParent((nsIFrame **)&row2);
rr = row2->GetRowIndex ();
cc = cell->GetColIndex ();
printf("O%d,%c ", rr, cc);
@ -1188,7 +1188,7 @@ void nsTableFrame::DidComputeHorizontalCollapsingBorders(nsIPresContext& aPresCo
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
rowFrame->GetRect(rowRect);
nsBorderEdge *leftBorder = (nsBorderEdge *)(mBorderEdges.mEdges[NS_SIDE_LEFT].ElementAt(0));
nsBorderEdge *rightBorder = (nsBorderEdge *)(mBorderEdges.mEdges[NS_SIDE_RIGHT].ElementAt(0));
@ -1212,7 +1212,7 @@ void nsTableFrame::DidComputeHorizontalCollapsingBorders(nsIPresContext& aPresCo
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
rowFrame->GetRect(rowRect);
nsBorderEdge *leftBorder = (nsBorderEdge *)(mBorderEdges.mEdges[NS_SIDE_LEFT].ElementAt(lastRowIndex));
nsBorderEdge *rightBorder = (nsBorderEdge *)(mBorderEdges.mEdges[NS_SIDE_RIGHT].ElementAt(lastRowIndex));
@ -1332,7 +1332,7 @@ void nsTableFrame::ComputeLeftBorderForEdgeAt(nsIPresContext& aPresContext,
// 2. colgroup
nsTableColFrame *colFrame = mCellMap->GetColumnFrame(aColIndex);
nsIFrame *colGroupFrame;
colFrame->GetParent(colGroupFrame);
colFrame->GetParent(&colGroupFrame);
colGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 3. col
@ -1350,10 +1350,10 @@ void nsTableFrame::ComputeLeftBorderForEdgeAt(nsIPresContext& aPresContext,
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
rowFrame->GetRect(rowRect);
nsIFrame *rowGroupFrame;
rowFrame->GetParent(rowGroupFrame);
rowFrame->GetParent(&rowGroupFrame);
rowGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 5. row
@ -1446,7 +1446,7 @@ void nsTableFrame::ComputeRightBorderForEdgeAt(nsIPresContext& aPresContext,
// 2. colgroup //XXX: need to test if we're really on a colgroup border
nsTableColFrame *colFrame = mCellMap->GetColumnFrame(aColIndex);
nsIFrame *colGroupFrame;
colFrame->GetParent(colGroupFrame);
colFrame->GetParent(&colGroupFrame);
colGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 3. col
@ -1464,10 +1464,10 @@ void nsTableFrame::ComputeRightBorderForEdgeAt(nsIPresContext& aPresContext,
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
rowFrame->GetRect(rowRect);
nsIFrame *rowGroupFrame;
rowFrame->GetParent(rowGroupFrame);
rowFrame->GetParent(&rowGroupFrame);
if (nsnull==rightNeighborFrame)
{ // if rightNeighborFrame is null, our right neighbor is the table so we include the rowgroup and row
rowGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
@ -1545,7 +1545,7 @@ void nsTableFrame::ComputeTopBorderForEdgeAt(nsIPresContext& aPresContext,
// 2. colgroup
nsTableColFrame *colFrame = mCellMap->GetColumnFrame(aColIndex);
nsIFrame *colGroupFrame;
colFrame->GetParent(colGroupFrame);
colFrame->GetParent(&colGroupFrame);
colGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 3. col
@ -1562,9 +1562,9 @@ void nsTableFrame::ComputeTopBorderForEdgeAt(nsIPresContext& aPresContext,
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
nsIFrame *rowGroupFrame;
rowFrame->GetParent(rowGroupFrame);
rowFrame->GetParent(&rowGroupFrame);
rowGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 5. row
@ -1664,7 +1664,7 @@ void nsTableFrame::ComputeBottomBorderForEdgeAt(nsIPresContext& aPresContext,
// 2. colgroup // XXX: need to deterine if we're on a colgroup boundary
nsTableColFrame *colFrame = mCellMap->GetColumnFrame(aColIndex);
nsIFrame *colGroupFrame;
colFrame->GetParent(colGroupFrame);
colFrame->GetParent(&colGroupFrame);
colGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 3. col
@ -1683,10 +1683,10 @@ void nsTableFrame::ComputeBottomBorderForEdgeAt(nsIPresContext& aPresContext,
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
rowFrame->GetRect(rowRect);
nsIFrame *rowGroupFrame;
rowFrame->GetParent(rowGroupFrame);
rowFrame->GetParent(&rowGroupFrame);
rowGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 5. row
@ -2670,7 +2670,7 @@ NS_METHOD nsTableFrame::IncrementalReflow(nsIPresContext& aPresContext,
{
// this is the target if target is either this or the outer table frame containing this inner frame
nsIFrame *outerTableFrame=nsnull;
GetParent(outerTableFrame);
GetParent(&outerTableFrame);
if ((this==target) || (outerTableFrame==target))
rv = IR_TargetIsMe(aPresContext, aDesiredSize, state, aStatus);
else
@ -4572,7 +4572,7 @@ NS_METHOD nsTableFrame::GetTableFrame(nsIFrame *aSourceFrame, nsTableFrame *& aT
if (nsnull!=aSourceFrame)
{
// "result" is the result of intermediate calls, not the result we return from this method
nsresult result = aSourceFrame->GetParent((nsIFrame *&)parentFrame);
nsresult result = aSourceFrame->GetParent((nsIFrame **)&parentFrame);
while ((NS_OK==result) && (nsnull!=parentFrame))
{
const nsStyleDisplay *display;
@ -4583,7 +4583,7 @@ NS_METHOD nsTableFrame::GetTableFrame(nsIFrame *aSourceFrame, nsTableFrame *& aT
rv = NS_OK; // only set if we found the table frame
break;
}
result = parentFrame->GetParent((nsIFrame *&)parentFrame);
result = parentFrame->GetParent((nsIFrame **)&parentFrame);
}
}
NS_POSTCONDITION(nsnull!=aTableFrame, "unable to find table parent. aTableFrame null.");
@ -4716,7 +4716,7 @@ nscoord nsTableFrame::GetTableContainerWidth(const nsHTMLReflowState& aReflowSta
// we only want to do this for inner table frames, so check the frame's parent to make sure it is an outer table frame
// we know that if both the frame and it's parent map to NS_STYLE_DISPLAY_TABLE, then we have an inner table frame
nsIFrame * tableFrameParent;
rs->frame->GetParent(tableFrameParent);
rs->frame->GetParent(&tableFrameParent);
tableFrameParent->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)display);
if (NS_STYLE_DISPLAY_TABLE==display->mDisplay)
{
@ -4887,7 +4887,7 @@ PRBool nsTableFrame::TableIsAutoWidth(nsTableFrame *aTableFrame,
nscoord nsTableFrame::GetMinCaptionWidth()
{
nsIFrame *outerTableFrame=nsnull;
GetParent(outerTableFrame);
GetParent(&outerTableFrame);
return (((nsTableOuterFrame *)outerTableFrame)->GetMinCaptionWidth());
}

2
layout/html/table/src/nsTableOuterFrame.cpp
Просмотреть файл

@ -1142,7 +1142,7 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI
NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow");
nsTableOuterFrame* parent;
nextInFlow->GetParent((nsIFrame*&)parent);
nextInFlow->GetParent((nsIFrame**)&parent);
// If the next-in-flow has a next-in-flow then delete it too (and
// delete it first).

2
layout/html/table/src/nsTableRowGroupFrame.cpp
Просмотреть файл

@ -999,7 +999,7 @@ nsTableRowGroupFrame::Reflow(nsIPresContext& aPresContext,
mStyleContext->GetPseudoType(pseudoTag);
if (pseudoTag == nsHTMLAtoms::scrolledContentPseudo) {
nsIFrame* scrollFrame;
GetParent(scrollFrame);
GetParent(&scrollFrame);
const nsStyleDisplay *display;
scrollFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display));
if ((NS_STYLE_OVERFLOW_SCROLL == display->mOverflow) ||

6
layout/style/nsStyleContext.cpp
Просмотреть файл

@ -137,7 +137,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
case eStyleUnit_Inherit:
nsIFrame* parentFrame;
aFrame->GetParent(parentFrame); // XXX may not be direct parent...
aFrame->GetParent(&parentFrame); // XXX may not be direct parent...
if (nsnull != parentFrame) {
nsIStyleContext* parentContext;
parentFrame->GetStyleContext(&parentContext);
@ -168,7 +168,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
nscoord baseWidth = 0;
PRBool isBase = PR_FALSE;
nsIFrame* frame;
aFrame->GetParent(frame);
aFrame->GetParent(&frame);
while (nsnull != frame) {
frame->IsPercentageBase(isBase);
if (isBase) {
@ -177,7 +177,7 @@ static nscoord CalcSideFor(const nsIFrame* aFrame, const nsStyleCoord& aCoord,
baseWidth = size.width; // not really width, need to subtract out padding...
break;
}
frame->GetParent(frame);
frame->GetParent(&frame);
}
result = (nscoord)((float)baseWidth * aCoord.GetPercentValue());
}

2
layout/tables/nsTableCellFrame.h
Просмотреть файл

@ -214,7 +214,7 @@ public:
inline PRInt32 nsTableCellFrame::GetRowIndex()
{
nsTableRowFrame * row;
GetParent((nsIFrame *&)row);
GetParent((nsIFrame **)&row);
if (nsnull!=row)
return row->GetRowIndex();
else

46
layout/tables/nsTableFrame.cpp
Просмотреть файл

@ -708,12 +708,12 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
// first, need to get the nearest containing content object
GetContent(&lastColGroupElement); // ADDREF a: lastColGroupElement++ (either here or in the loop below)
nsIFrame *parentFrame;
GetParent(parentFrame);
GetParent(&parentFrame);
while (nsnull==lastColGroupElement)
{
parentFrame->GetContent(&lastColGroupElement);
if (nsnull==lastColGroupElement)
parentFrame->GetParent(parentFrame);
parentFrame->GetParent(&parentFrame);
}
// now we have a ref-counted "lastColGroupElement" content object
nsIStyleContext* colGroupStyleContext =
@ -970,7 +970,7 @@ void nsTableFrame::DumpCellMap ()
{
nsTableCellFrame *cell = cd->mRealCell->mCell;
nsTableRowFrame *row;
cell->GetParent((nsIFrame *&)row);
cell->GetParent((nsIFrame **)&row);
int rr = row->GetRowIndex ();
int cc = cell->GetColIndex ();
printf("S%d,%d ", rr, cc);
@ -978,7 +978,7 @@ void nsTableFrame::DumpCellMap ()
{
cell = cd->mOverlap->mCell;
nsTableRowFrame* row2;
cell->GetParent((nsIFrame *&)row2);
cell->GetParent((nsIFrame **)&row2);
rr = row2->GetRowIndex ();
cc = cell->GetColIndex ();
printf("O%d,%c ", rr, cc);
@ -1188,7 +1188,7 @@ void nsTableFrame::DidComputeHorizontalCollapsingBorders(nsIPresContext& aPresCo
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
rowFrame->GetRect(rowRect);
nsBorderEdge *leftBorder = (nsBorderEdge *)(mBorderEdges.mEdges[NS_SIDE_LEFT].ElementAt(0));
nsBorderEdge *rightBorder = (nsBorderEdge *)(mBorderEdges.mEdges[NS_SIDE_RIGHT].ElementAt(0));
@ -1212,7 +1212,7 @@ void nsTableFrame::DidComputeHorizontalCollapsingBorders(nsIPresContext& aPresCo
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
rowFrame->GetRect(rowRect);
nsBorderEdge *leftBorder = (nsBorderEdge *)(mBorderEdges.mEdges[NS_SIDE_LEFT].ElementAt(lastRowIndex));
nsBorderEdge *rightBorder = (nsBorderEdge *)(mBorderEdges.mEdges[NS_SIDE_RIGHT].ElementAt(lastRowIndex));
@ -1332,7 +1332,7 @@ void nsTableFrame::ComputeLeftBorderForEdgeAt(nsIPresContext& aPresContext,
// 2. colgroup
nsTableColFrame *colFrame = mCellMap->GetColumnFrame(aColIndex);
nsIFrame *colGroupFrame;
colFrame->GetParent(colGroupFrame);
colFrame->GetParent(&colGroupFrame);
colGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 3. col
@ -1350,10 +1350,10 @@ void nsTableFrame::ComputeLeftBorderForEdgeAt(nsIPresContext& aPresContext,
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
rowFrame->GetRect(rowRect);
nsIFrame *rowGroupFrame;
rowFrame->GetParent(rowGroupFrame);
rowFrame->GetParent(&rowGroupFrame);
rowGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 5. row
@ -1446,7 +1446,7 @@ void nsTableFrame::ComputeRightBorderForEdgeAt(nsIPresContext& aPresContext,
// 2. colgroup //XXX: need to test if we're really on a colgroup border
nsTableColFrame *colFrame = mCellMap->GetColumnFrame(aColIndex);
nsIFrame *colGroupFrame;
colFrame->GetParent(colGroupFrame);
colFrame->GetParent(&colGroupFrame);
colGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 3. col
@ -1464,10 +1464,10 @@ void nsTableFrame::ComputeRightBorderForEdgeAt(nsIPresContext& aPresContext,
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
rowFrame->GetRect(rowRect);
nsIFrame *rowGroupFrame;
rowFrame->GetParent(rowGroupFrame);
rowFrame->GetParent(&rowGroupFrame);
if (nsnull==rightNeighborFrame)
{ // if rightNeighborFrame is null, our right neighbor is the table so we include the rowgroup and row
rowGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
@ -1545,7 +1545,7 @@ void nsTableFrame::ComputeTopBorderForEdgeAt(nsIPresContext& aPresContext,
// 2. colgroup
nsTableColFrame *colFrame = mCellMap->GetColumnFrame(aColIndex);
nsIFrame *colGroupFrame;
colFrame->GetParent(colGroupFrame);
colFrame->GetParent(&colGroupFrame);
colGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 3. col
@ -1562,9 +1562,9 @@ void nsTableFrame::ComputeTopBorderForEdgeAt(nsIPresContext& aPresContext,
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
nsIFrame *rowGroupFrame;
rowFrame->GetParent(rowGroupFrame);
rowFrame->GetParent(&rowGroupFrame);
rowGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 5. row
@ -1664,7 +1664,7 @@ void nsTableFrame::ComputeBottomBorderForEdgeAt(nsIPresContext& aPresContext,
// 2. colgroup // XXX: need to deterine if we're on a colgroup boundary
nsTableColFrame *colFrame = mCellMap->GetColumnFrame(aColIndex);
nsIFrame *colGroupFrame;
colFrame->GetParent(colGroupFrame);
colFrame->GetParent(&colGroupFrame);
colGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 3. col
@ -1683,10 +1683,10 @@ void nsTableFrame::ComputeBottomBorderForEdgeAt(nsIPresContext& aPresContext,
if (nsnull!=cellFrame)
{
nsIFrame *rowFrame;
cellFrame->GetParent(rowFrame);
cellFrame->GetParent(&rowFrame);
rowFrame->GetRect(rowRect);
nsIFrame *rowGroupFrame;
rowFrame->GetParent(rowGroupFrame);
rowFrame->GetParent(&rowGroupFrame);
rowGroupFrame->GetStyleData(eStyleStruct_Spacing, ((const nsStyleStruct *&)spacing));
styles.AppendElement((void*)spacing);
// 5. row
@ -2670,7 +2670,7 @@ NS_METHOD nsTableFrame::IncrementalReflow(nsIPresContext& aPresContext,
{
// this is the target if target is either this or the outer table frame containing this inner frame
nsIFrame *outerTableFrame=nsnull;
GetParent(outerTableFrame);
GetParent(&outerTableFrame);
if ((this==target) || (outerTableFrame==target))
rv = IR_TargetIsMe(aPresContext, aDesiredSize, state, aStatus);
else
@ -4572,7 +4572,7 @@ NS_METHOD nsTableFrame::GetTableFrame(nsIFrame *aSourceFrame, nsTableFrame *& aT
if (nsnull!=aSourceFrame)
{
// "result" is the result of intermediate calls, not the result we return from this method
nsresult result = aSourceFrame->GetParent((nsIFrame *&)parentFrame);
nsresult result = aSourceFrame->GetParent((nsIFrame **)&parentFrame);
while ((NS_OK==result) && (nsnull!=parentFrame))
{
const nsStyleDisplay *display;
@ -4583,7 +4583,7 @@ NS_METHOD nsTableFrame::GetTableFrame(nsIFrame *aSourceFrame, nsTableFrame *& aT
rv = NS_OK; // only set if we found the table frame
break;
}
result = parentFrame->GetParent((nsIFrame *&)parentFrame);
result = parentFrame->GetParent((nsIFrame **)&parentFrame);
}
}
NS_POSTCONDITION(nsnull!=aTableFrame, "unable to find table parent. aTableFrame null.");
@ -4716,7 +4716,7 @@ nscoord nsTableFrame::GetTableContainerWidth(const nsHTMLReflowState& aReflowSta
// we only want to do this for inner table frames, so check the frame's parent to make sure it is an outer table frame
// we know that if both the frame and it's parent map to NS_STYLE_DISPLAY_TABLE, then we have an inner table frame
nsIFrame * tableFrameParent;
rs->frame->GetParent(tableFrameParent);
rs->frame->GetParent(&tableFrameParent);
tableFrameParent->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)display);
if (NS_STYLE_DISPLAY_TABLE==display->mDisplay)
{
@ -4887,7 +4887,7 @@ PRBool nsTableFrame::TableIsAutoWidth(nsTableFrame *aTableFrame,
nscoord nsTableFrame::GetMinCaptionWidth()
{
nsIFrame *outerTableFrame=nsnull;
GetParent(outerTableFrame);
GetParent(&outerTableFrame);
return (((nsTableOuterFrame *)outerTableFrame)->GetMinCaptionWidth());
}

2
layout/tables/nsTableOuterFrame.cpp
Просмотреть файл

@ -1142,7 +1142,7 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI
NS_PRECONDITION(nsnull != nextInFlow, "null next-in-flow");
nsTableOuterFrame* parent;
nextInFlow->GetParent((nsIFrame*&)parent);
nextInFlow->GetParent((nsIFrame**)&parent);
// If the next-in-flow has a next-in-flow then delete it too (and
// delete it first).

2
layout/tables/nsTableRowGroupFrame.cpp
Просмотреть файл

@ -999,7 +999,7 @@ nsTableRowGroupFrame::Reflow(nsIPresContext& aPresContext,
mStyleContext->GetPseudoType(pseudoTag);
if (pseudoTag == nsHTMLAtoms::scrolledContentPseudo) {
nsIFrame* scrollFrame;
GetParent(scrollFrame);
GetParent(&scrollFrame);
const nsStyleDisplay *display;
scrollFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)display));
if ((NS_STYLE_OVERFLOW_SCROLL == display->mOverflow) ||

6
layout/xul/base/src/nsTreeCellFrame.cpp
Просмотреть файл

@ -90,7 +90,7 @@ nsTreeCellFrame::Init(nsIPresContext& aPresContext,
// Get row group frame
nsIFrame* pRowGroupFrame = nsnull;
aParent->GetParent(pRowGroupFrame);
aParent->GetParent(&pRowGroupFrame);
if (pRowGroupFrame != nsnull)
{
// Get the display type of the row group frame and see if it's a header or body
@ -107,7 +107,7 @@ nsTreeCellFrame::Init(nsIPresContext& aPresContext,
else mIsHeader = PR_FALSE;
// Get the table frame.
pRowGroupFrame->GetParent((nsIFrame*&)mTreeFrame);
pRowGroupFrame->GetParent((nsIFrame**)mTreeFrame);
}
}
@ -236,7 +236,7 @@ nsTreeCellFrame::HandleDoubleClickEvent(nsIPresContext& aPresContext,
// Get the frame that corresponds to the document element
pShell->GetPrimaryFrameFor(pRoot, docElementFrame);
if (nsnull != docElementFrame) {
docElementFrame->GetParent(parentFrame);
docElementFrame->GetParent(&parentFrame);
pShell->EnterReflowLock();
pStyleSet->ReconstructFrames(&aPresContext, pRoot,

2
layout/xul/base/src/nsTreeIndentationFrame.cpp
Просмотреть файл

@ -82,7 +82,7 @@ nsTreeIndentationFrame::Reflow(nsIPresContext& aPresContext,
{
while (aFrame && pTag && pTag != nsXULAtoms::treeitem)
{
aFrame->GetParent(aFrame);
aFrame->GetParent(&aFrame);
// nsCOMPtr correctly handles releasing the old |pContent| and |pTag|
aFrame->GetContent(getter_AddRefs(pContent));