Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed GetNextSibling() to use a pointer argument instead of a reference

Browse Source
This commit is contained in:
troy%netscape.com 1999-02-10 06:13:38 +00:00
parent 9d570499cf
commit 034aa56b83
55 changed files with 548 additions and 546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layout/base/nsPresShell.cpp
View File

@ -1408,7 +1408,7 @@ FindFrameWithContent(nsIFrame* aFrame, nsIContent* aContent)
NS_IF_RELEASE(listName); NS_IF_RELEASE(listName);
return result; return result;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
NS_IF_RELEASE(listName); NS_IF_RELEASE(listName);
aFrame->GetAdditionalChildListName(listIndex++, &listName); aFrame->GetAdditionalChildListName(listIndex++, &listName);
@ -1732,8 +1732,8 @@ CompareTrees(nsIFrame* aA, nsIFrame* aB)
CompareTrees(k1, k2); CompareTrees(k1, k2);
// Advance to next sibling // Advance to next sibling
k1->GetNextSibling(k1); k1->GetNextSibling(&k1);
k2->GetNextSibling(k2); k2->GetNextSibling(&k2);
} }
else { else {
break; break;

2
layout/base/public/nsIFrame.h
View File

@ -339,7 +339,7 @@ public:
/** /**
* Child frames are linked together in a singly-linked * Child frames are linked together in a singly-linked
*/ */
NS_IMETHOD GetNextSibling(nsIFrame*& aNextSibling) const = 0; NS_IMETHOD GetNextSibling(nsIFrame** aNextSibling) const = 0;
NS_IMETHOD SetNextSibling(nsIFrame* aNextSibling) = 0; NS_IMETHOD SetNextSibling(nsIFrame* aNextSibling) = 0;
/** /**

4
layout/base/src/nsRangeList.cpp
View File

@ -596,7 +596,7 @@ getNextFrame(nsIFrame *aStart)
return result; return result;
} }
while(parent){ while(parent){
if (NS_SUCCEEDED(parent->GetNextSibling(result)) && result){ if (NS_SUCCEEDED(parent->GetNextSibling(&result)) && result){
parent = result; parent = result;
return result; return result;
} }
@ -867,7 +867,7 @@ findFrameFromContent(nsIFrame *aParent, nsIContent *aContent, PRBool aTurnOff)
if (result) if (result)
return result; return result;
} }
while (child && NS_SUCCEEDED(child->GetNextSibling(child))); //this is ok. no addrefs or releases while (child && NS_SUCCEEDED(child->GetNextSibling(&child))); //this is ok. no addrefs or releases
return result; return result;
} }

4
layout/forms/nsFieldSetFrame.cpp
View File

@ -148,7 +148,7 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext& aPresContext,
nsresult result = frame->QueryInterface(kLegendFrameCID, (void**)&legendFrame); nsresult result = frame->QueryInterface(kLegendFrameCID, (void**)&legendFrame);
if ((NS_OK == result) && legendFrame) { if ((NS_OK == result) && legendFrame) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
frame->GetNextSibling(nextFrame); frame->GetNextSibling(&nextFrame);
if (lastFrame) { if (lastFrame) {
lastFrame->SetNextSibling(nextFrame); lastFrame->SetNextSibling(nextFrame);
} else { } else {
@ -161,7 +161,7 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext& aPresContext,
frame = nextFrame; frame = nextFrame;
} else { } else {
frame->SetParent(mFrames.FirstChild()); frame->SetParent(mFrames.FirstChild());
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
lastFrame = frame; lastFrame = frame;
} }

2
layout/forms/nsFileControlFrame.cpp
View File

@ -239,7 +239,7 @@ NS_IMETHODIMP nsFileControlFrame::Reflow(nsIPresContext& aPresContext,
maxSize.width -= desiredSize.width; maxSize.width -= desiredSize.width;
aDesiredSize.width += desiredSize.width; aDesiredSize.width += desiredSize.width;
aDesiredSize.height = desiredSize.height; aDesiredSize.height = desiredSize.height;
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
offset.x += desiredSize.width + CONTROL_SPACING; offset.x += desiredSize.width + CONTROL_SPACING;
} }
} }

2
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@ -553,7 +553,7 @@ nsHTMLButtonControlFrame::SetInitialChildList(nsIPresContext& aPresContext,
NS_RELEASE(styleContext); NS_RELEASE(styleContext);
// Set the parent for each of the child frames // Set the parent for each of the child frames
for (nsIFrame* frame = aChildList; nsnull != frame; frame->GetNextSibling(frame)) { for (nsIFrame* frame = aChildList; nsnull != frame; frame->GetNextSibling(&frame)) {
frame->SetParent(mFrames.FirstChild()); frame->SetParent(mFrames.FirstChild());
} }

2
layout/forms/nsLegendFrame.cpp
View File

@ -101,7 +101,7 @@ nsLegendFrame::SetInitialChildList(nsIPresContext& aPresContext,
NS_RELEASE(styleContext); NS_RELEASE(styleContext);
// Set the parent for each of the child frames // Set the parent for each of the child frames
for (nsIFrame* frame = aChildList; nsnull != frame; frame->GetNextSibling(frame)) { for (nsIFrame* frame = aChildList; nsnull != frame; frame->GetNextSibling(&frame)) {
frame->SetParent(mFrames.FirstChild()); frame->SetParent(mFrames.FirstChild());
} }

18
layout/forms/nsListControlFrame.cpp
View File

@ -208,7 +208,7 @@ nsListControlFrame::GetFrameForPointUsing(const nsPoint& aPoint,
//*aFrame = kid; //*aFrame = kid;
//return NS_OK; //return NS_OK;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
mContentFrame->FirstChild(aList, &kid); mContentFrame->FirstChild(aList, &kid);
@ -222,7 +222,7 @@ nsListControlFrame::GetFrameForPointUsing(const nsPoint& aPoint,
return NS_OK; return NS_OK;
} }
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
*aFrame = this; *aFrame = this;
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -326,7 +326,7 @@ nsListControlFrame::Reflow(nsIPresContext& aPresContext,
//??nsRect rect(offset.x, offset.y, desiredLineSize.width+lineEndPadding, desiredLineSize.height); //??nsRect rect(offset.x, offset.y, desiredLineSize.width+lineEndPadding, desiredLineSize.height);
nsRect rect(offset.x, offset.y, insideWidth, desiredLineSize.height); nsRect rect(offset.x, offset.y, insideWidth, desiredLineSize.height);
childFrame->SetRect(rect); childFrame->SetRect(rect);
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
offset.x = 0; offset.x = 0;
offset.y += desiredLineSize.height; offset.y += desiredLineSize.height;
} }
@ -378,7 +378,7 @@ nsListControlFrame::GetOptionFromChild(nsIFrame* aParentFrame)
if (nsnull != frame) { if (nsnull != frame) {
return frame; return frame;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
return nsnull; return nsnull;
} }
@ -438,7 +438,7 @@ PRInt32 nsListControlFrame::SetContentSelected(nsIFrame * aHitFrame,
aHitContent->SetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::kClass, (aIsSelected?kSelectedFocus:kNormal), PR_TRUE); aHitContent->SetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::kClass, (aIsSelected?kSelectedFocus:kNormal), PR_TRUE);
return index; return index;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
index++; index++;
} }
return -1; return -1;
@ -460,7 +460,7 @@ void nsListControlFrame::ClearSelection()
} }
} }
NS_RELEASE(content); NS_RELEASE(content);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
i++; i++;
} }
} }
@ -503,7 +503,7 @@ void nsListControlFrame::ExtendedSelection(PRInt32 aStartIndex, PRInt32 aEndInde
startInverting = PR_FALSE; startInverting = PR_FALSE;
} }
NS_RELEASE(content); NS_RELEASE(content);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
i++; i++;
} }
} }
@ -1046,7 +1046,7 @@ nsListControlFrame::AboutToDropDown()
return NS_OK; return NS_OK;
} }
NS_RELEASE(content); NS_RELEASE(content);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
i++; i++;
} }
return NS_OK; return NS_OK;
@ -1096,7 +1096,7 @@ nsListControlFrame::InitializeFromContent(PRBool aDoDisplay)
NS_RELEASE(option); NS_RELEASE(option);
} }
NS_RELEASE(content); NS_RELEASE(content);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
i++; i++;
} }

6
layout/generic/nsAreaFrame.cpp
View File

@ -267,7 +267,7 @@ NS_IMETHODIMP
nsAreaFrame::GetPositionedInfo(nscoord& aXMost, nscoord& aYMost) const nsAreaFrame::GetPositionedInfo(nscoord& aXMost, nscoord& aYMost) const
{ {
aXMost = aYMost = 0; aXMost = aYMost = 0;
for (nsIFrame* f = mAbsoluteFrames.FirstChild(); nsnull != f; f->GetNextSibling(f)) { for (nsIFrame* f = mAbsoluteFrames.FirstChild(); nsnull != f; f->GetNextSibling(&f)) {
// Get the frame's x-most and y-most. This is for its flowed content only // Get the frame's x-most and y-most. This is for its flowed content only
nsRect rect; nsRect rect;
f->GetRect(rect); f->GetRect(rect);
@ -400,7 +400,7 @@ nsAreaFrame::IncrementalReflow(nsIPresContext& aPresContext,
nsReflowStatus status; nsReflowStatus status;
ReflowAbsoluteFrame(aPresContext, aReflowState, newFrames, PR_TRUE, status); ReflowAbsoluteFrame(aPresContext, aReflowState, newFrames, PR_TRUE, status);
newFrames->GetNextSibling(newFrames); newFrames->GetNextSibling(&newFrames);
} }
} }
@ -671,7 +671,7 @@ nsAreaFrame::ReflowAbsoluteFrames(nsIPresContext& aPresContext,
} }
nsIFrame* kidFrame; nsIFrame* kidFrame;
for (kidFrame = mAbsoluteFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) { for (kidFrame = mAbsoluteFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
// Reflow the frame // Reflow the frame
nsReflowStatus kidStatus; nsReflowStatus kidStatus;
ReflowAbsoluteFrame(aPresContext, reflowState, kidFrame, PR_FALSE, ReflowAbsoluteFrame(aPresContext, reflowState, kidFrame, PR_FALSE,

72
layout/generic/nsBlockFrame.cpp
View File

@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
nsIFrame* frame = aLine->mFirstChild; nsIFrame* frame = aLine->mFirstChild;
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while (--n >= 0) { while (--n >= 0) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
#endif #endif
@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while ((--n >= 0) && NS_SUCCEEDED(rv)) { while ((--n >= 0) && NS_SUCCEEDED(rv)) {
rv = child->ReResolveStyleContext(aPresContext, aStyleContext); rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
aLine = aLine->mNext; aLine = aLine->mNext;
} }
@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
else { else {
rv = child->ReResolveStyleContext(aPresContext, mStyleContext); rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
line = line->mNext; line = line->mNext;
} }
@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out); fputs("<\n", out);
while (nsnull != kid) { while (nsnull != kid) {
kid->List(out, aIndent + 1); kid->List(out, aIndent + 1);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
IndentBy(out, aIndent); IndentBy(out, aIndent);
fputs(">\n", out); fputs(">\n", out);
@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
while (--n >= 0) { while (--n >= 0) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
lastFrame->SetNextSibling(nsnull); lastFrame->SetNextSibling(nsnull);
@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
} }
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
if (0 != --fromLine->mChildCount) { if (0 != --fromLine->mChildCount) {
// Mark line dirty now that we pulled a child // Mark line dirty now that we pulled a child
fromLine->MarkDirty(); fromLine->MarkDirty();
frame->GetNextSibling(fromLine->mFirstChild); frame->GetNextSibling(&fromLine->mFirstChild);
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
@ -1908,7 +1908,7 @@ ListTag(stdout); printf(": SlideFrames: line=%p dy=%d\n", aDY);
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
// Adjust line state // Adjust line state
@ -1973,7 +1973,7 @@ ListTag(stdout); printf(": MoveInSpaceManager: d=%d,%d\n", aDeltaX, aDeltaY);
if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) { if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) {
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
line = line->mNext; line = line->mNext;
@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
nsIFrame* frame = aFrame; nsIFrame* frame = aFrame;
for (;;) { for (;;) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
frame->GetNextSibling(nextFrame); frame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
const nsStyleDisplay* display; const nsStyleDisplay* display;
nextFrame->GetStyleData(eStyleStruct_Display, nextFrame->GetStyleData(eStyleStruct_Display,
@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
// Push continuation to a new line, but only if we actually // Push continuation to a new line, but only if we actually
// made one. // made one.
if (madeContinuation) { if (madeContinuation) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK); nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
if (nsnull == line) { if (nsnull == line) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
} }
// Split line, but after the frame just reflowed // Split line, but after the frame just reflowed
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
if (needSplit) { if (needSplit) {
// Split line after the current frame // Split line after the current frame
aKeepLineGoing = PR_FALSE; aKeepLineGoing = PR_FALSE;
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
if (NS_OK != rv) { if (NS_OK != rv) {
return rv; return rv;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
return NS_OK; return NS_OK;
@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
PRInt32 n = aLine->ChildCount(); PRInt32 n = aLine->ChildCount();
while (--n >= 0) { while (--n >= 0) {
FindFloatersIn(frame, floaters); FindFloatersIn(frame, floaters);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLine->mFloaters = floaters; aLine->mFloaters = floaters;
@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
// Now create some lines for the new frames // Now create some lines for the new frames
nsIFrame* prevFrame = lastFrame; nsIFrame* prevFrame = lastFrame;
for (nsIFrame* frame = aNewFrame; nsnull != frame; for (nsIFrame* frame = aNewFrame; nsnull != frame;
frame->GetNextSibling(frame)) { frame->GetNextSibling(&frame)) {
// See if the child is a block or non-block // See if the child is a block or non-block
const nsStyleDisplay* kidDisplay; const nsStyleDisplay* kidDisplay;
rv = frame->GetStyleData(eStyleStruct_Display, rv = frame->GetStyleData(eStyleStruct_Display,
@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
nsIFrame* newFrame = aFrameList; nsIFrame* newFrame = aFrameList;
while (nsnull != newFrame) { while (nsnull != newFrame) {
nsIFrame* next; nsIFrame* next;
newFrame->GetNextSibling(next); newFrame->GetNextSibling(&next);
newFrame->SetNextSibling(nsnull); newFrame->SetNextSibling(nsnull);
const nsStyleDisplay* display; const nsStyleDisplay* display;
@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (frame == aPrevSibling) { if (frame == aPrevSibling) {
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
// Create new line to hold the remaining frames // Create new line to hold the remaining frames
NS_ASSERTION(n - i - 1 > 0, "bad line count"); NS_ASSERTION(n - i - 1 > 0, "bad line count");
@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
line->mChildCount = i + 1; line->mChildCount = i + 1;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Now create a new line to hold the block // Now create a new line to hold the block
@ -3370,7 +3370,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
// after the above logic because the above logic depends on the // after the above logic because the above logic depends on the
// sibling list being in the "before insertion" state. // sibling list being in the "before insertion" state.
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
newFrame->SetNextSibling(nextSibling); newFrame->SetNextSibling(nextSibling);
aPrevSibling->SetNextSibling(newFrame); aPrevSibling->SetNextSibling(newFrame);
} }
@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
goto found_frame; goto found_frame;
} }
prevSibling = frame; prevSibling = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
linep = &line->mNext; linep = &line->mNext;
prevLine = line; prevLine = line;
@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
NS_ASSERTION(nsnull != line, "can't find deleted frame in lines"); NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
if (nsnull != prevSibling) { if (nsnull != prevSibling) {
nsIFrame* tmp; nsIFrame* tmp;
prevSibling->GetNextSibling(tmp); prevSibling->GetNextSibling(&tmp);
NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling"); NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
} }
#endif #endif
@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// Get the deleted frames next sibling // Get the deleted frames next sibling
nsIFrame* nextFrame; nsIFrame* nextFrame;
aDeletedFrame->GetNextSibling(nextFrame); aDeletedFrame->GetNextSibling(&nextFrame);
// Remove aDeletedFrame from the line // Remove aDeletedFrame from the line
if (line->mFirstChild == aDeletedFrame) { if (line->mFirstChild == aDeletedFrame) {
@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
NS_RELEASE(tc); NS_RELEASE(tc);
NS_RELEASE(content); NS_RELEASE(content);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return PR_TRUE; return PR_TRUE;
} }
@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
PRInt32 n = line->ChildCount(); PRInt32 n = line->ChildCount();
while (--n >= 0) { while (--n >= 0) {
nsIFrame* nextChild; nsIFrame* nextChild;
child->GetNextSibling(nextChild); child->GetNextSibling(&nextChild);
if (child == aChild) { if (child == aChild) {
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS, NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("nsBlockFrame::RemoveChild: line=%p frame=%p", ("nsBlockFrame::RemoveChild: line=%p frame=%p",
@ -3921,7 +3921,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
break; break;
} }
@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
} }
@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
while (--n >= 0) { while (--n >= 0) {
PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
aWhichLayer); aWhichLayer);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
} }
@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLines = aLines->mNext; aLines = aLines->mNext;
} }
@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
return PR_FALSE; return PR_FALSE;
@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
} }
} }
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
block = (nsBlockFrame*) block->mNextInFlow; block = (nsBlockFrame*) block->mNextInFlow;
} }
@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
// therefore it will end an open text run. // therefore it will end an open text run.
ll.EndTextRun(); ll.EndTextRun();
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
else { else {
@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
// Remove frame from line and mark the line dirty // Remove frame from line and mark the line dirty
--line->mChildCount; --line->mChildCount;
line->MarkDirty(); line->MarkDirty();
firstChild->GetNextSibling(line->mFirstChild); firstChild->GetNextSibling(&line->mFirstChild);
} }
// Break linkage to next child after stolen frame // Break linkage to next child after stolen frame
@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
done = PR_TRUE; done = PR_TRUE;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
if (done) { if (done) {
break; break;

72
layout/generic/nsBlockReflowState.cpp
View File

@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
nsIFrame* frame = aLine->mFirstChild; nsIFrame* frame = aLine->mFirstChild;
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while (--n >= 0) { while (--n >= 0) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
#endif #endif
@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while ((--n >= 0) && NS_SUCCEEDED(rv)) { while ((--n >= 0) && NS_SUCCEEDED(rv)) {
rv = child->ReResolveStyleContext(aPresContext, aStyleContext); rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
aLine = aLine->mNext; aLine = aLine->mNext;
} }
@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
else { else {
rv = child->ReResolveStyleContext(aPresContext, mStyleContext); rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
line = line->mNext; line = line->mNext;
} }
@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out); fputs("<\n", out);
while (nsnull != kid) { while (nsnull != kid) {
kid->List(out, aIndent + 1); kid->List(out, aIndent + 1);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
IndentBy(out, aIndent); IndentBy(out, aIndent);
fputs(">\n", out); fputs(">\n", out);
@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
while (--n >= 0) { while (--n >= 0) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
lastFrame->SetNextSibling(nsnull); lastFrame->SetNextSibling(nsnull);
@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
} }
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
if (0 != --fromLine->mChildCount) { if (0 != --fromLine->mChildCount) {
// Mark line dirty now that we pulled a child // Mark line dirty now that we pulled a child
fromLine->MarkDirty(); fromLine->MarkDirty();
frame->GetNextSibling(fromLine->mFirstChild); frame->GetNextSibling(&fromLine->mFirstChild);
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
@ -1908,7 +1908,7 @@ ListTag(stdout); printf(": SlideFrames: line=%p dy=%d\n", aDY);
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
// Adjust line state // Adjust line state
@ -1973,7 +1973,7 @@ ListTag(stdout); printf(": MoveInSpaceManager: d=%d,%d\n", aDeltaX, aDeltaY);
if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) { if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) {
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
line = line->mNext; line = line->mNext;
@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
nsIFrame* frame = aFrame; nsIFrame* frame = aFrame;
for (;;) { for (;;) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
frame->GetNextSibling(nextFrame); frame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
const nsStyleDisplay* display; const nsStyleDisplay* display;
nextFrame->GetStyleData(eStyleStruct_Display, nextFrame->GetStyleData(eStyleStruct_Display,
@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
// Push continuation to a new line, but only if we actually // Push continuation to a new line, but only if we actually
// made one. // made one.
if (madeContinuation) { if (madeContinuation) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK); nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
if (nsnull == line) { if (nsnull == line) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
} }
// Split line, but after the frame just reflowed // Split line, but after the frame just reflowed
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
if (needSplit) { if (needSplit) {
// Split line after the current frame // Split line after the current frame
aKeepLineGoing = PR_FALSE; aKeepLineGoing = PR_FALSE;
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
if (NS_OK != rv) { if (NS_OK != rv) {
return rv; return rv;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
return NS_OK; return NS_OK;
@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
PRInt32 n = aLine->ChildCount(); PRInt32 n = aLine->ChildCount();
while (--n >= 0) { while (--n >= 0) {
FindFloatersIn(frame, floaters); FindFloatersIn(frame, floaters);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLine->mFloaters = floaters; aLine->mFloaters = floaters;
@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
// Now create some lines for the new frames // Now create some lines for the new frames
nsIFrame* prevFrame = lastFrame; nsIFrame* prevFrame = lastFrame;
for (nsIFrame* frame = aNewFrame; nsnull != frame; for (nsIFrame* frame = aNewFrame; nsnull != frame;
frame->GetNextSibling(frame)) { frame->GetNextSibling(&frame)) {
// See if the child is a block or non-block // See if the child is a block or non-block
const nsStyleDisplay* kidDisplay; const nsStyleDisplay* kidDisplay;
rv = frame->GetStyleData(eStyleStruct_Display, rv = frame->GetStyleData(eStyleStruct_Display,
@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
nsIFrame* newFrame = aFrameList; nsIFrame* newFrame = aFrameList;
while (nsnull != newFrame) { while (nsnull != newFrame) {
nsIFrame* next; nsIFrame* next;
newFrame->GetNextSibling(next); newFrame->GetNextSibling(&next);
newFrame->SetNextSibling(nsnull); newFrame->SetNextSibling(nsnull);
const nsStyleDisplay* display; const nsStyleDisplay* display;
@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (frame == aPrevSibling) { if (frame == aPrevSibling) {
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
// Create new line to hold the remaining frames // Create new line to hold the remaining frames
NS_ASSERTION(n - i - 1 > 0, "bad line count"); NS_ASSERTION(n - i - 1 > 0, "bad line count");
@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
line->mChildCount = i + 1; line->mChildCount = i + 1;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Now create a new line to hold the block // Now create a new line to hold the block
@ -3370,7 +3370,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
// after the above logic because the above logic depends on the // after the above logic because the above logic depends on the
// sibling list being in the "before insertion" state. // sibling list being in the "before insertion" state.
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
newFrame->SetNextSibling(nextSibling); newFrame->SetNextSibling(nextSibling);
aPrevSibling->SetNextSibling(newFrame); aPrevSibling->SetNextSibling(newFrame);
} }
@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
goto found_frame; goto found_frame;
} }
prevSibling = frame; prevSibling = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
linep = &line->mNext; linep = &line->mNext;
prevLine = line; prevLine = line;
@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
NS_ASSERTION(nsnull != line, "can't find deleted frame in lines"); NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
if (nsnull != prevSibling) { if (nsnull != prevSibling) {
nsIFrame* tmp; nsIFrame* tmp;
prevSibling->GetNextSibling(tmp); prevSibling->GetNextSibling(&tmp);
NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling"); NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
} }
#endif #endif
@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// Get the deleted frames next sibling // Get the deleted frames next sibling
nsIFrame* nextFrame; nsIFrame* nextFrame;
aDeletedFrame->GetNextSibling(nextFrame); aDeletedFrame->GetNextSibling(&nextFrame);
// Remove aDeletedFrame from the line // Remove aDeletedFrame from the line
if (line->mFirstChild == aDeletedFrame) { if (line->mFirstChild == aDeletedFrame) {
@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
NS_RELEASE(tc); NS_RELEASE(tc);
NS_RELEASE(content); NS_RELEASE(content);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return PR_TRUE; return PR_TRUE;
} }
@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
PRInt32 n = line->ChildCount(); PRInt32 n = line->ChildCount();
while (--n >= 0) { while (--n >= 0) {
nsIFrame* nextChild; nsIFrame* nextChild;
child->GetNextSibling(nextChild); child->GetNextSibling(&nextChild);
if (child == aChild) { if (child == aChild) {
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS, NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("nsBlockFrame::RemoveChild: line=%p frame=%p", ("nsBlockFrame::RemoveChild: line=%p frame=%p",
@ -3921,7 +3921,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
break; break;
} }
@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
} }
@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
while (--n >= 0) { while (--n >= 0) {
PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
aWhichLayer); aWhichLayer);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
} }
@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLines = aLines->mNext; aLines = aLines->mNext;
} }
@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
return PR_FALSE; return PR_FALSE;
@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
} }
} }
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
block = (nsBlockFrame*) block->mNextInFlow; block = (nsBlockFrame*) block->mNextInFlow;
} }
@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
// therefore it will end an open text run. // therefore it will end an open text run.
ll.EndTextRun(); ll.EndTextRun();
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
else { else {
@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
// Remove frame from line and mark the line dirty // Remove frame from line and mark the line dirty
--line->mChildCount; --line->mChildCount;
line->MarkDirty(); line->MarkDirty();
firstChild->GetNextSibling(line->mFirstChild); firstChild->GetNextSibling(&line->mFirstChild);
} }
// Break linkage to next child after stolen frame // Break linkage to next child after stolen frame
@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
done = PR_TRUE; done = PR_TRUE;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
if (done) { if (done) {
break; break;

72
layout/generic/nsBlockReflowState.h
View File

@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
nsIFrame* frame = aLine->mFirstChild; nsIFrame* frame = aLine->mFirstChild;
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while (--n >= 0) { while (--n >= 0) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
#endif #endif
@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while ((--n >= 0) && NS_SUCCEEDED(rv)) { while ((--n >= 0) && NS_SUCCEEDED(rv)) {
rv = child->ReResolveStyleContext(aPresContext, aStyleContext); rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
aLine = aLine->mNext; aLine = aLine->mNext;
} }
@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
else { else {
rv = child->ReResolveStyleContext(aPresContext, mStyleContext); rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
line = line->mNext; line = line->mNext;
} }
@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out); fputs("<\n", out);
while (nsnull != kid) { while (nsnull != kid) {
kid->List(out, aIndent + 1); kid->List(out, aIndent + 1);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
IndentBy(out, aIndent); IndentBy(out, aIndent);
fputs(">\n", out); fputs(">\n", out);
@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
while (--n >= 0) { while (--n >= 0) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
lastFrame->SetNextSibling(nsnull); lastFrame->SetNextSibling(nsnull);
@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
} }
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
if (0 != --fromLine->mChildCount) { if (0 != --fromLine->mChildCount) {
// Mark line dirty now that we pulled a child // Mark line dirty now that we pulled a child
fromLine->MarkDirty(); fromLine->MarkDirty();
frame->GetNextSibling(fromLine->mFirstChild); frame->GetNextSibling(&fromLine->mFirstChild);
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
@ -1908,7 +1908,7 @@ ListTag(stdout); printf(": SlideFrames: line=%p dy=%d\n", aDY);
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
// Adjust line state // Adjust line state
@ -1973,7 +1973,7 @@ ListTag(stdout); printf(": MoveInSpaceManager: d=%d,%d\n", aDeltaX, aDeltaY);
if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) { if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) {
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
line = line->mNext; line = line->mNext;
@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
nsIFrame* frame = aFrame; nsIFrame* frame = aFrame;
for (;;) { for (;;) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
frame->GetNextSibling(nextFrame); frame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
const nsStyleDisplay* display; const nsStyleDisplay* display;
nextFrame->GetStyleData(eStyleStruct_Display, nextFrame->GetStyleData(eStyleStruct_Display,
@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
// Push continuation to a new line, but only if we actually // Push continuation to a new line, but only if we actually
// made one. // made one.
if (madeContinuation) { if (madeContinuation) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK); nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
if (nsnull == line) { if (nsnull == line) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
} }
// Split line, but after the frame just reflowed // Split line, but after the frame just reflowed
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
if (needSplit) { if (needSplit) {
// Split line after the current frame // Split line after the current frame
aKeepLineGoing = PR_FALSE; aKeepLineGoing = PR_FALSE;
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
if (NS_OK != rv) { if (NS_OK != rv) {
return rv; return rv;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
return NS_OK; return NS_OK;
@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
PRInt32 n = aLine->ChildCount(); PRInt32 n = aLine->ChildCount();
while (--n >= 0) { while (--n >= 0) {
FindFloatersIn(frame, floaters); FindFloatersIn(frame, floaters);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLine->mFloaters = floaters; aLine->mFloaters = floaters;
@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
// Now create some lines for the new frames // Now create some lines for the new frames
nsIFrame* prevFrame = lastFrame; nsIFrame* prevFrame = lastFrame;
for (nsIFrame* frame = aNewFrame; nsnull != frame; for (nsIFrame* frame = aNewFrame; nsnull != frame;
frame->GetNextSibling(frame)) { frame->GetNextSibling(&frame)) {
// See if the child is a block or non-block // See if the child is a block or non-block
const nsStyleDisplay* kidDisplay; const nsStyleDisplay* kidDisplay;
rv = frame->GetStyleData(eStyleStruct_Display, rv = frame->GetStyleData(eStyleStruct_Display,
@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
nsIFrame* newFrame = aFrameList; nsIFrame* newFrame = aFrameList;
while (nsnull != newFrame) { while (nsnull != newFrame) {
nsIFrame* next; nsIFrame* next;
newFrame->GetNextSibling(next); newFrame->GetNextSibling(&next);
newFrame->SetNextSibling(nsnull); newFrame->SetNextSibling(nsnull);
const nsStyleDisplay* display; const nsStyleDisplay* display;
@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (frame == aPrevSibling) { if (frame == aPrevSibling) {
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
// Create new line to hold the remaining frames // Create new line to hold the remaining frames
NS_ASSERTION(n - i - 1 > 0, "bad line count"); NS_ASSERTION(n - i - 1 > 0, "bad line count");
@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
line->mChildCount = i + 1; line->mChildCount = i + 1;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Now create a new line to hold the block // Now create a new line to hold the block
@ -3370,7 +3370,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
// after the above logic because the above logic depends on the // after the above logic because the above logic depends on the
// sibling list being in the "before insertion" state. // sibling list being in the "before insertion" state.
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
newFrame->SetNextSibling(nextSibling); newFrame->SetNextSibling(nextSibling);
aPrevSibling->SetNextSibling(newFrame); aPrevSibling->SetNextSibling(newFrame);
} }
@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
goto found_frame; goto found_frame;
} }
prevSibling = frame; prevSibling = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
linep = &line->mNext; linep = &line->mNext;
prevLine = line; prevLine = line;
@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
NS_ASSERTION(nsnull != line, "can't find deleted frame in lines"); NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
if (nsnull != prevSibling) { if (nsnull != prevSibling) {
nsIFrame* tmp; nsIFrame* tmp;
prevSibling->GetNextSibling(tmp); prevSibling->GetNextSibling(&tmp);
NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling"); NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
} }
#endif #endif
@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// Get the deleted frames next sibling // Get the deleted frames next sibling
nsIFrame* nextFrame; nsIFrame* nextFrame;
aDeletedFrame->GetNextSibling(nextFrame); aDeletedFrame->GetNextSibling(&nextFrame);
// Remove aDeletedFrame from the line // Remove aDeletedFrame from the line
if (line->mFirstChild == aDeletedFrame) { if (line->mFirstChild == aDeletedFrame) {
@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
NS_RELEASE(tc); NS_RELEASE(tc);
NS_RELEASE(content); NS_RELEASE(content);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return PR_TRUE; return PR_TRUE;
} }
@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
PRInt32 n = line->ChildCount(); PRInt32 n = line->ChildCount();
while (--n >= 0) { while (--n >= 0) {
nsIFrame* nextChild; nsIFrame* nextChild;
child->GetNextSibling(nextChild); child->GetNextSibling(&nextChild);
if (child == aChild) { if (child == aChild) {
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS, NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("nsBlockFrame::RemoveChild: line=%p frame=%p", ("nsBlockFrame::RemoveChild: line=%p frame=%p",
@ -3921,7 +3921,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
break; break;
} }
@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
} }
@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
while (--n >= 0) { while (--n >= 0) {
PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
aWhichLayer); aWhichLayer);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
} }
@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLines = aLines->mNext; aLines = aLines->mNext;
} }
@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
return PR_FALSE; return PR_FALSE;
@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
} }
} }
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
block = (nsBlockFrame*) block->mNextInFlow; block = (nsBlockFrame*) block->mNextInFlow;
} }
@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
// therefore it will end an open text run. // therefore it will end an open text run.
ll.EndTextRun(); ll.EndTextRun();
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
else { else {
@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
// Remove frame from line and mark the line dirty // Remove frame from line and mark the line dirty
--line->mChildCount; --line->mChildCount;
line->MarkDirty(); line->MarkDirty();
firstChild->GetNextSibling(line->mFirstChild); firstChild->GetNextSibling(&line->mFirstChild);
} }
// Break linkage to next child after stolen frame // Break linkage to next child after stolen frame
@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
done = PR_TRUE; done = PR_TRUE;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
if (done) { if (done) {
break; break;

24
layout/generic/nsContainerFrame.cpp
View File

@ -102,7 +102,7 @@ nsContainerFrame::DidReflow(nsIPresContext& aPresContext,
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
htmlReflow->DidReflow(aPresContext, aStatus); htmlReflow->DidReflow(aPresContext, aStatus);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
NS_IF_RELEASE(listName); NS_IF_RELEASE(listName);
GetAdditionalChildListName(listIndex++, &listName); GetAdditionalChildListName(listIndex++, &listName);
@ -148,14 +148,14 @@ nsContainerFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
result = FirstChild(nsnull, &child); result = FirstChild(nsnull, &child);
while ((NS_SUCCEEDED(result)) && (nsnull != child)) { while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
result = child->ReResolveStyleContext(aPresContext, mStyleContext); result = child->ReResolveStyleContext(aPresContext, mStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
// Update overflow list too // Update overflow list too
child = mOverflowFrames.FirstChild(); child = mOverflowFrames.FirstChild();
while ((NS_SUCCEEDED(result)) && (nsnull != child)) { while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
result = child->ReResolveStyleContext(aPresContext, mStyleContext); result = child->ReResolveStyleContext(aPresContext, mStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
// And just to be complete, update our prev-in-flows overflow list // And just to be complete, update our prev-in-flows overflow list
@ -164,7 +164,7 @@ nsContainerFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
child = ((nsContainerFrame*)mPrevInFlow)->mOverflowFrames.FirstChild(); child = ((nsContainerFrame*)mPrevInFlow)->mOverflowFrames.FirstChild();
while ((NS_SUCCEEDED(result)) && (nsnull != child)) { while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
result = child->ReResolveStyleContext(aPresContext, mStyleContext); result = child->ReResolveStyleContext(aPresContext, mStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
} }
} }
@ -214,7 +214,7 @@ nsContainerFrame::PaintChildren(nsIPresContext& aPresContext,
nsIFrame* kid = mFrames.FirstChild(); nsIFrame* kid = mFrames.FirstChild();
while (nsnull != kid) { while (nsnull != kid) {
PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer); PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
if (NS_STYLE_OVERFLOW_HIDDEN == disp->mOverflow) { if (NS_STYLE_OVERFLOW_HIDDEN == disp->mOverflow) {
@ -312,7 +312,7 @@ nsContainerFrame::GetFrameForPointUsing(const nsPoint& aPoint,
tmp.MoveTo(aPoint.x - kidRect.x, aPoint.y - kidRect.y); tmp.MoveTo(aPoint.x - kidRect.x, aPoint.y - kidRect.y);
return kid->GetFrameForPoint(tmp, aFrame); return kid->GetFrameForPoint(tmp, aFrame);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
FirstChild(aList, &kid); FirstChild(aList, &kid);
@ -326,7 +326,7 @@ nsContainerFrame::GetFrameForPointUsing(const nsPoint& aPoint,
return NS_OK; return NS_OK;
} }
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
*aFrame = this; *aFrame = this;
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -419,7 +419,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
// Take the next-in-flow out of the parent's child list // Take the next-in-flow out of the parent's child list
if (parent->mFrames.FirstChild() == nextInFlow) { if (parent->mFrames.FirstChild() == nextInFlow) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
nextInFlow->GetNextSibling(nextFrame); nextInFlow->GetNextSibling(&nextFrame);
parent->mFrames.SetFrames(nextFrame); parent->mFrames.SetFrames(nextFrame);
} else { } else {
nsIFrame* nextSibling; nsIFrame* nextSibling;
@ -430,10 +430,10 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
// next-in-flow is the last next-in-flow for aChild AND the // next-in-flow is the last next-in-flow for aChild AND the
// next-in-flow is not the last child in parent) // next-in-flow is not the last child in parent)
NS_ASSERTION(((nsContainerFrame*)parent)->IsChild(aChild), "screwy flow"); NS_ASSERTION(((nsContainerFrame*)parent)->IsChild(aChild), "screwy flow");
aChild->GetNextSibling(nextSibling); aChild->GetNextSibling(&nextSibling);
NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling"); NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling");
nextInFlow->GetNextSibling(nextSibling); nextInFlow->GetNextSibling(&nextSibling);
aChild->SetNextSibling(nextSibling); aChild->SetNextSibling(nextSibling);
} }
@ -467,7 +467,7 @@ nsContainerFrame::PushChildren(nsIFrame* aFromChild, nsIFrame* aPrevSibling)
NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child"); NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child");
#ifdef NS_DEBUG #ifdef NS_DEBUG
nsIFrame* prevNextSibling; nsIFrame* prevNextSibling;
aPrevSibling->GetNextSibling(prevNextSibling); aPrevSibling->GetNextSibling(&prevNextSibling);
NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling"); NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling");
#endif #endif
@ -620,7 +620,7 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out); fputs("<\n", out);
while (nsnull != kid) { while (nsnull != kid) {
kid->List(out, aIndent + 1); kid->List(out, aIndent + 1);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
IndentBy(out, aIndent); IndentBy(out, aIndent);
fputs(">\n", out); fputs(">\n", out);

11
layout/generic/nsFrame.cpp
View File

@ -1576,9 +1576,10 @@ NS_IMETHODIMP nsFrame::GetAutoMarginSize(PRUint8 aSide, nscoord& aSize) const
// Sibling pointer used to link together frames // Sibling pointer used to link together frames
NS_IMETHODIMP nsFrame::GetNextSibling(nsIFrame*& aNextSibling) const NS_IMETHODIMP nsFrame::GetNextSibling(nsIFrame** aNextSibling) const
{ {
aNextSibling = mNextSibling; NS_PRECONDITION(nsnull != aNextSibling, "null OUT parameter pointer");
*aNextSibling = mNextSibling;
return NS_OK; return NS_OK;
} }
@ -1777,7 +1778,7 @@ nsFrame::DumpBaseRegressionData(FILE* out, PRInt32 aIndent)
aIndent++; aIndent++;
while (nsnull != kid) { while (nsnull != kid) {
kid->DumpRegressionData(out, aIndent); kid->DumpRegressionData(out, aIndent);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
aIndent--; aIndent--;
IndentBy(out, aIndent); IndentBy(out, aIndent);
@ -1833,7 +1834,7 @@ nsFrame::SetSelectedContentOffsets(PRBool aSelected, PRInt32 aBeginContentOffset
aForceRedraw , aTracker, aActualSelected); aForceRedraw , aTracker, aActualSelected);
if (NS_SUCCEEDED(result) && aActualSelected) if (NS_SUCCEEDED(result) && aActualSelected)
return result; //done. return result; //done.
result |= child->GetNextSibling(child); result |= child->GetNextSibling(&child);
} }
return result; return result;
} }
@ -1956,7 +1957,7 @@ static void RefreshAllContentFrames(nsIFrame * aFrame, nsIContent * aContent)
aFrame->FirstChild(nsnull, &aFrame); aFrame->FirstChild(nsnull, &aFrame);
while (aFrame) { while (aFrame) {
RefreshAllContentFrames(aFrame, aContent); RefreshAllContentFrames(aFrame, aContent);
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
} }
} }

2
layout/generic/nsFrame.h
View File

@ -194,7 +194,7 @@ public:
NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const;
NS_IMETHOD IsPercentageBase(PRBool& aBase) const; NS_IMETHOD IsPercentageBase(PRBool& aBase) const;
NS_IMETHOD GetAutoMarginSize(PRUint8 aSide, nscoord& aSize) const; NS_IMETHOD GetAutoMarginSize(PRUint8 aSide, nscoord& aSize) const;
NS_IMETHOD GetNextSibling(nsIFrame*& aNextSibling) const; NS_IMETHOD GetNextSibling(nsIFrame** aNextSibling) const;
NS_IMETHOD SetNextSibling(nsIFrame* aNextSibling); NS_IMETHOD SetNextSibling(nsIFrame* aNextSibling);
NS_IMETHOD IsTransparent(PRBool& aTransparent) const; NS_IMETHOD IsTransparent(PRBool& aTransparent) const;
NS_IMETHOD Scrolled(nsIView *aView); NS_IMETHOD Scrolled(nsIView *aView);

4
layout/generic/nsFrameSetFrame.cpp
View File

@ -417,7 +417,7 @@ void nsHTMLFramesetFrame::GetSizeOfChild(nsIFrame* aChild,
// this assumption is used here // this assumption is used here
int i = 0; int i = 0;
for (nsIFrame* child = mFrames.FirstChild(); child; for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) { child->GetNextSibling(&child)) {
if (aChild == child) { if (aChild == child) {
nsPoint ignore; nsPoint ignore;
GetSizeOfChildAt(i, aSize, ignore); GetSizeOfChildAt(i, aSize, ignore);
@ -1150,7 +1150,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext,
lastCol = cellIndex.x; lastCol = cellIndex.x;
lastSize = size; lastSize = size;
offset.x += size.width; offset.x += size.width;
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
if (firstTime) { if (firstTime) {

4
layout/generic/nsHTMLContainerFrame.cpp
View File

@ -123,7 +123,7 @@ nsHTMLContainerFrame::MoveFrameOutOfFlow(nsIPresContext& aPresContext,
// Set aFrame's next sibling to nsnull, and remember the current next // Set aFrame's next sibling to nsnull, and remember the current next
// sibling pointer // sibling pointer
aFrame->GetNextSibling(nextSibling); aFrame->GetNextSibling(&nextSibling);
aFrame->SetNextSibling(nsnull); aFrame->SetNextSibling(nsnull);
// Create a placeholder frame that will serve as the anchor point. // Create a placeholder frame that will serve as the anchor point.
@ -157,7 +157,7 @@ nsHTMLContainerFrame::CreateNextInFlow(nsIPresContext& aPresContext,
// Create a continuation frame for the child frame and insert it // Create a continuation frame for the child frame and insert it
// into our lines child list. // into our lines child list.
nsIFrame* nextFrame; nsIFrame* nextFrame;
aFrame->GetNextSibling(nextFrame); aFrame->GetNextSibling(&nextFrame);
nsIStyleContext* kidSC; nsIStyleContext* kidSC;
aFrame->GetStyleContext(&kidSC); aFrame->GetStyleContext(&kidSC);
aFrame->CreateContinuingFrame(aPresContext, aOuterFrame, aFrame->CreateContinuingFrame(aPresContext, aOuterFrame,

2
layout/generic/nsIFrame.h
View File

@ -339,7 +339,7 @@ public:
/** /**
* Child frames are linked together in a singly-linked * Child frames are linked together in a singly-linked
*/ */
NS_IMETHOD GetNextSibling(nsIFrame*& aNextSibling) const = 0; NS_IMETHOD GetNextSibling(nsIFrame** aNextSibling) const = 0;
NS_IMETHOD SetNextSibling(nsIFrame* aNextSibling) = 0; NS_IMETHOD SetNextSibling(nsIFrame* aNextSibling) = 0;
/** /**

38
layout/generic/nsInlineFrame.cpp
View File

@ -239,7 +239,7 @@ nsInlineFrame::SectionData::SectionData(nsIFrame* aFrameList)
} }
} }
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
@ -264,7 +264,7 @@ nsInlineFrame::SectionData::SplitFrameList(nsFrameList& aSection1,
if (lastFrame != lastBlock) { if (lastFrame != lastBlock) {
// There are inline frames that follow the last block. Setup section3. // There are inline frames that follow the last block. Setup section3.
nsIFrame* remainder; nsIFrame* remainder;
lastBlock->GetNextSibling(remainder); lastBlock->GetNextSibling(&remainder);
lastBlock->SetNextSibling(nsnull); lastBlock->SetNextSibling(nsnull);
aSection3.SetFrames(remainder); aSection3.SetFrames(remainder);
} }
@ -346,7 +346,7 @@ nsInlineFrame::MoveOutOfFlow(nsIPresContext& aPresContext,
frame = placeholder; frame = placeholder;
} }
prevFrame = frame; prevFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return NS_OK; return NS_OK;
} }
@ -367,7 +367,7 @@ nsInlineFrame::FindPrevAnonymousBlock(nsInlineFrame** aBlockParent)
*aBlockParent = prevInFlow; *aBlockParent = prevInFlow;
return (nsAnonymousBlockFrame*) frame; return (nsAnonymousBlockFrame*) frame;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
prevInFlow = (nsInlineFrame*) prevInFlow->mPrevInFlow; prevInFlow = (nsInlineFrame*) prevInFlow->mPrevInFlow;
} }
@ -390,7 +390,7 @@ nsInlineFrame::FindAnonymousBlock(nsInlineFrame** aBlockParent)
*aBlockParent = nextInFlow; *aBlockParent = nextInFlow;
return (nsAnonymousBlockFrame*) frame; return (nsAnonymousBlockFrame*) frame;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
nextInFlow = (nsInlineFrame*) nextInFlow->mNextInFlow; nextInFlow = (nsInlineFrame*) nextInFlow->mNextInFlow;
} }
@ -421,7 +421,7 @@ nsInlineFrame::CreateAnonymousBlock(nsIPresContext& aPresContext,
nsIFrame* frame = aInitialFrames; nsIFrame* frame = aInitialFrames;
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(bf); frame->SetParent(bf);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
rv = bf->SetInitialChildList(aPresContext, nsnull, aInitialFrames); rv = bf->SetInitialChildList(aPresContext, nsnull, aInitialFrames);
} }
@ -504,7 +504,7 @@ nsInlineFrame::AppendFrames(nsIPresContext& aPresContext,
// this frame, stealing children from our continuation frames as // this frame, stealing children from our continuation frames as
// necessary. // necessary.
nsIFrame* inlineSiblings; nsIFrame* inlineSiblings;
anonymousBlock->GetNextSibling(inlineSiblings); anonymousBlock->GetNextSibling(&inlineSiblings);
nsFrameList newBlockFrames; nsFrameList newBlockFrames;
if (nsnull != inlineSiblings) { if (nsnull != inlineSiblings) {
newBlockFrames.AppendFrames(anonymousBlock, inlineSiblings); newBlockFrames.AppendFrames(anonymousBlock, inlineSiblings);
@ -715,7 +715,7 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext,
nsIFrame* frame = aFrameList; nsIFrame* frame = aFrameList;
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(prevFrameParent); frame->SetParent(prevFrameParent);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
nsAnonymousBlockFrame* anonymousBlock; nsAnonymousBlockFrame* anonymousBlock;
anonymousBlock = (nsAnonymousBlockFrame*) prevFrameParent; anonymousBlock = (nsAnonymousBlockFrame*) prevFrameParent;
@ -872,7 +872,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
// frames into the anonymous block if they should be in // frames into the anonymous block if they should be in
// section3. // section3.
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevFrame->GetNextSibling(nextSibling); aPrevFrame->GetNextSibling(&nextSibling);
nsIFrame* anonymousBlockNextInFlow; nsIFrame* anonymousBlockNextInFlow;
prevFrameParent->GetNextInFlow(anonymousBlockNextInFlow); prevFrameParent->GetNextInFlow(anonymousBlockNextInFlow);
if ((nsnull != nextSibling) || (nsnull != anonymousBlockNextInFlow)) { if ((nsnull != nextSibling) || (nsnull != anonymousBlockNextInFlow)) {
@ -881,7 +881,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
nsIFrame* frame = aFrameList; nsIFrame* frame = aFrameList;
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(anonymousBlock); frame->SetParent(anonymousBlock);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
anonymousBlock->InsertFrames2(aPresContext, aPresShell, nsnull, anonymousBlock->InsertFrames2(aPresContext, aPresShell, nsnull,
aPrevFrame, aFrameList); aPrevFrame, aFrameList);
@ -899,7 +899,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
nsIFrame* frame = aFrameList; nsIFrame* frame = aFrameList;
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(anonymousBlockParent); frame->SetParent(anonymousBlockParent);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
anonymousBlockParent->mFrames.InsertFrames(nsnull, anonymousBlock, anonymousBlockParent->mFrames.InsertFrames(nsnull, anonymousBlock,
aFrameList); aFrameList);
@ -1001,7 +1001,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
// last block in the anonymous block. // last block in the anonymous block.
anonymousBlock->GetNextInFlow(nextInFlow); anonymousBlock->GetNextInFlow(nextInFlow);
nsIFrame* nextSib; nsIFrame* nextSib;
aOldFrame->GetNextSibling(nextSib); aOldFrame->GetNextSibling(&nextSib);
if ((nsnull != nextInFlow) || (nsnull != nextSib)) { if ((nsnull != nextInFlow) || (nsnull != nextSib)) {
// There is a block in the anonymous block after the block // There is a block in the anonymous block after the block
// that we are removing. This means that we can let the // that we are removing. This means that we can let the
@ -1051,7 +1051,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
SectionData sd(kids); SectionData sd(kids);
if (sd.HasABlock()) { if (sd.HasABlock()) {
kids = sd.lastBlock; kids = sd.lastBlock;
kids->GetNextSibling(kids); kids->GetNextSibling(&kids);
if (nsnull != kids) { if (nsnull != kids) {
// Take the frames that follow the last block // Take the frames that follow the last block
// (which are inline frames) and remove them from // (which are inline frames) and remove them from
@ -1127,7 +1127,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
break; break;
} }
nsIFrame* next; nsIFrame* next;
kid->GetNextSibling(next); kid->GetNextSibling(&next);
anonymousBlock->RemoveFirstFrame(); anonymousBlock->RemoveFirstFrame();
frames.AppendFrame(nsnull, kid); frames.AppendFrame(nsnull, kid);
kid = next; kid = next;
@ -1354,7 +1354,7 @@ nsInlineFrame::ReflowInlineFrames(ReflowState& rs,
break; break;
} }
rs.prevFrame = frame; rs.prevFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Attempt to pull frames from our next-in-flow until we can't // Attempt to pull frames from our next-in-flow until we can't
@ -1453,7 +1453,7 @@ nsInlineFrame::ReflowInlineFrame(ReflowState& rs,
} }
} }
nsIFrame* nextFrame; nsIFrame* nextFrame;
aFrame->GetNextSibling(nextFrame); aFrame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
aStatus |= NS_FRAME_NOT_COMPLETE; aStatus |= NS_FRAME_NOT_COMPLETE;
PushFrames(nextFrame, aFrame); PushFrames(nextFrame, aFrame);
@ -1479,7 +1479,7 @@ nsInlineFrame::ReflowInlineFrame(ReflowState& rs,
return rv; return rv;
} }
nsIFrame* nextFrame; nsIFrame* nextFrame;
aFrame->GetNextSibling(nextFrame); aFrame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
PushFrames(nextFrame, aFrame); PushFrames(nextFrame, aFrame);
} }
@ -1559,7 +1559,7 @@ nsInlineFrame::PushFrames(nsIFrame* aFromChild, nsIFrame* aPrevSibling)
NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child"); NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child");
#ifdef NS_DEBUG #ifdef NS_DEBUG
nsIFrame* prevNextSibling; nsIFrame* prevNextSibling;
aPrevSibling->GetNextSibling(prevNextSibling); aPrevSibling->GetNextSibling(&prevNextSibling);
NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling"); NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling");
#endif #endif
@ -1637,7 +1637,7 @@ nsInlineFrame::ReflowBlockFrame(ReflowState& rs,
// inline frames. Make sure we reflect that in our reflow status // inline frames. Make sure we reflect that in our reflow status
// and push them to our next-in-flow. // and push them to our next-in-flow.
nsIFrame* nextFrame; nsIFrame* nextFrame;
blockFrame->GetNextSibling(nextFrame); blockFrame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
PushFrames(nextFrame, blockFrame); PushFrames(nextFrame, blockFrame);
aStatus |= NS_FRAME_NOT_COMPLETE; aStatus |= NS_FRAME_NOT_COMPLETE;

8
layout/generic/nsLineBox.cpp
View File

@ -94,7 +94,7 @@ nsLineBox::List(FILE* out, PRInt32 aIndent) const
PRInt32 n = ChildCount(); PRInt32 n = ChildCount();
while (--n >= 0) { while (--n >= 0) {
frame->List(out, aIndent + 1); frame->List(out, aIndent + 1);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
for (i = aIndent; --i >= 0; ) fputs(" ", out); for (i = aIndent; --i >= 0; ) fputs(" ", out);
@ -112,7 +112,7 @@ nsLineBox::LastChild() const
nsIFrame* frame = mFirstChild; nsIFrame* frame = mFirstChild;
PRInt32 n = ChildCount() - 1; PRInt32 n = ChildCount() - 1;
while (--n >= 0) { while (--n >= 0) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return frame; return frame;
} }
@ -133,7 +133,7 @@ nsLineBox::Contains(nsIFrame* aFrame) const
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return PR_FALSE; return PR_FALSE;
} }
@ -223,7 +223,7 @@ nsLineBox::DeleteLineList(nsIPresContext& aPresContext, nsLineBox* aLine)
// view. // view.
for (nsIFrame* child = aLine->mFirstChild; child; ) { for (nsIFrame* child = aLine->mFirstChild; child; ) {
nsIFrame* nextChild; nsIFrame* nextChild;
child->GetNextSibling(nextChild); child->GetNextSibling(&nextChild);
child->DeleteFrame(aPresContext); child->DeleteFrame(aPresContext);
child = nextChild; child = nextChild;
} }

12
layout/generic/nsSimplePageSequence.cpp
View File

@ -88,7 +88,7 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext& aPresContext,
// Compute the y-offset of this page // Compute the y-offset of this page
for (nsIFrame* f = mFrames.FirstChild(); f != nextFrame; for (nsIFrame* f = mFrames.FirstChild(); f != nextFrame;
f->GetNextSibling(f)) { f->GetNextSibling(&f)) {
nsSize size; nsSize size;
f->GetSize(size); f->GetSize(size);
@ -111,13 +111,13 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext& aPresContext,
// XXX Check if the page is complete... // XXX Check if the page is complete...
// Update the y-offset to reflect the remaining pages // Update the y-offset to reflect the remaining pages
nextFrame->GetNextSibling(nextFrame); nextFrame->GetNextSibling(&nextFrame);
while (nsnull != nextFrame) { while (nsnull != nextFrame) {
nsSize size; nsSize size;
nextFrame->GetSize(size); nextFrame->GetSize(size);
y += size.height + PAGE_SPACING_TWIPS; y += size.height + PAGE_SPACING_TWIPS;
nextFrame->GetNextSibling(nextFrame); nextFrame->GetNextSibling(&nextFrame);
} }
} else { } else {
@ -163,14 +163,14 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext& aPresContext,
// Add it to our child list // Add it to our child list
#ifdef NS_DEBUG #ifdef NS_DEBUG
nsIFrame* kidNextSibling; nsIFrame* kidNextSibling;
kidFrame->GetNextSibling(kidNextSibling); kidFrame->GetNextSibling(&kidNextSibling);
NS_ASSERTION(nsnull == kidNextSibling, "unexpected sibling"); NS_ASSERTION(nsnull == kidNextSibling, "unexpected sibling");
#endif #endif
kidFrame->SetNextSibling(continuingPage); kidFrame->SetNextSibling(continuingPage);
} }
// Get the next page // Get the next page
kidFrame->GetNextSibling(kidFrame); kidFrame->GetNextSibling(&kidFrame);
} }
} }
@ -276,7 +276,7 @@ nsSimplePageSequenceFrame::Print(nsIPresContext& aPresContext,
// Print each specified page // Print each specified page
PRInt32 pageNum = 1; PRInt32 pageNum = 1;
for (nsIFrame* page = mFrames.FirstChild(); nsnull != page; page->GetNextSibling(page)) { for (nsIFrame* page = mFrames.FirstChild(); nsnull != page; page->GetNextSibling(&page)) {
// See whether we should print this page // See whether we should print this page
PRBool printThisPage = PR_TRUE; PRBool printThisPage = PR_TRUE;

4
layout/generic/nsViewportFrame.cpp
View File

@ -264,7 +264,7 @@ ViewportFrame::ReflowFixedFrames(nsIPresContext& aPresContext,
reflowState.computedHeight = height; reflowState.computedHeight = height;
nsIFrame* kidFrame; nsIFrame* kidFrame;
for (kidFrame = mFixedFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) { for (kidFrame = mFixedFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
// Reflow the frame using our reflow reason // Reflow the frame using our reflow reason
nsReflowStatus kidStatus; nsReflowStatus kidStatus;
ReflowFixedFrame(aPresContext, reflowState, kidFrame, PR_FALSE, kidStatus); ReflowFixedFrame(aPresContext, reflowState, kidFrame, PR_FALSE, kidStatus);
@ -338,7 +338,7 @@ ViewportFrame::IncrementalReflow(nsIPresContext& aPresContext,
nsReflowStatus status; nsReflowStatus status;
ReflowFixedFrame(aPresContext, reflowState, newFrames, PR_TRUE, status); ReflowFixedFrame(aPresContext, reflowState, newFrames, PR_TRUE, status);
newFrames->GetNextSibling(newFrames); newFrames->GetNextSibling(&newFrames);
} }
} }

6
layout/html/base/src/nsAreaFrame.cpp
View File

@ -267,7 +267,7 @@ NS_IMETHODIMP
nsAreaFrame::GetPositionedInfo(nscoord& aXMost, nscoord& aYMost) const nsAreaFrame::GetPositionedInfo(nscoord& aXMost, nscoord& aYMost) const
{ {
aXMost = aYMost = 0; aXMost = aYMost = 0;
for (nsIFrame* f = mAbsoluteFrames.FirstChild(); nsnull != f; f->GetNextSibling(f)) { for (nsIFrame* f = mAbsoluteFrames.FirstChild(); nsnull != f; f->GetNextSibling(&f)) {
// Get the frame's x-most and y-most. This is for its flowed content only // Get the frame's x-most and y-most. This is for its flowed content only
nsRect rect; nsRect rect;
f->GetRect(rect); f->GetRect(rect);
@ -400,7 +400,7 @@ nsAreaFrame::IncrementalReflow(nsIPresContext& aPresContext,
nsReflowStatus status; nsReflowStatus status;
ReflowAbsoluteFrame(aPresContext, aReflowState, newFrames, PR_TRUE, status); ReflowAbsoluteFrame(aPresContext, aReflowState, newFrames, PR_TRUE, status);
newFrames->GetNextSibling(newFrames); newFrames->GetNextSibling(&newFrames);
} }
} }
@ -671,7 +671,7 @@ nsAreaFrame::ReflowAbsoluteFrames(nsIPresContext& aPresContext,
} }
nsIFrame* kidFrame; nsIFrame* kidFrame;
for (kidFrame = mAbsoluteFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) { for (kidFrame = mAbsoluteFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
// Reflow the frame // Reflow the frame
nsReflowStatus kidStatus; nsReflowStatus kidStatus;
ReflowAbsoluteFrame(aPresContext, reflowState, kidFrame, PR_FALSE, ReflowAbsoluteFrame(aPresContext, reflowState, kidFrame, PR_FALSE,

72
layout/html/base/src/nsBlockFrame.cpp
View File

@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
nsIFrame* frame = aLine->mFirstChild; nsIFrame* frame = aLine->mFirstChild;
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while (--n >= 0) { while (--n >= 0) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
#endif #endif
@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while ((--n >= 0) && NS_SUCCEEDED(rv)) { while ((--n >= 0) && NS_SUCCEEDED(rv)) {
rv = child->ReResolveStyleContext(aPresContext, aStyleContext); rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
aLine = aLine->mNext; aLine = aLine->mNext;
} }
@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
else { else {
rv = child->ReResolveStyleContext(aPresContext, mStyleContext); rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
line = line->mNext; line = line->mNext;
} }
@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out); fputs("<\n", out);
while (nsnull != kid) { while (nsnull != kid) {
kid->List(out, aIndent + 1); kid->List(out, aIndent + 1);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
IndentBy(out, aIndent); IndentBy(out, aIndent);
fputs(">\n", out); fputs(">\n", out);
@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
while (--n >= 0) { while (--n >= 0) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
lastFrame->SetNextSibling(nsnull); lastFrame->SetNextSibling(nsnull);
@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
} }
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
if (0 != --fromLine->mChildCount) { if (0 != --fromLine->mChildCount) {
// Mark line dirty now that we pulled a child // Mark line dirty now that we pulled a child
fromLine->MarkDirty(); fromLine->MarkDirty();
frame->GetNextSibling(fromLine->mFirstChild); frame->GetNextSibling(&fromLine->mFirstChild);
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
@ -1908,7 +1908,7 @@ ListTag(stdout); printf(": SlideFrames: line=%p dy=%d\n", aDY);
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
// Adjust line state // Adjust line state
@ -1973,7 +1973,7 @@ ListTag(stdout); printf(": MoveInSpaceManager: d=%d,%d\n", aDeltaX, aDeltaY);
if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) { if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) {
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
line = line->mNext; line = line->mNext;
@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
nsIFrame* frame = aFrame; nsIFrame* frame = aFrame;
for (;;) { for (;;) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
frame->GetNextSibling(nextFrame); frame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
const nsStyleDisplay* display; const nsStyleDisplay* display;
nextFrame->GetStyleData(eStyleStruct_Display, nextFrame->GetStyleData(eStyleStruct_Display,
@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
// Push continuation to a new line, but only if we actually // Push continuation to a new line, but only if we actually
// made one. // made one.
if (madeContinuation) { if (madeContinuation) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK); nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
if (nsnull == line) { if (nsnull == line) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
} }
// Split line, but after the frame just reflowed // Split line, but after the frame just reflowed
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
if (needSplit) { if (needSplit) {
// Split line after the current frame // Split line after the current frame
aKeepLineGoing = PR_FALSE; aKeepLineGoing = PR_FALSE;
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
if (NS_OK != rv) { if (NS_OK != rv) {
return rv; return rv;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
return NS_OK; return NS_OK;
@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
PRInt32 n = aLine->ChildCount(); PRInt32 n = aLine->ChildCount();
while (--n >= 0) { while (--n >= 0) {
FindFloatersIn(frame, floaters); FindFloatersIn(frame, floaters);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLine->mFloaters = floaters; aLine->mFloaters = floaters;
@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
// Now create some lines for the new frames // Now create some lines for the new frames
nsIFrame* prevFrame = lastFrame; nsIFrame* prevFrame = lastFrame;
for (nsIFrame* frame = aNewFrame; nsnull != frame; for (nsIFrame* frame = aNewFrame; nsnull != frame;
frame->GetNextSibling(frame)) { frame->GetNextSibling(&frame)) {
// See if the child is a block or non-block // See if the child is a block or non-block
const nsStyleDisplay* kidDisplay; const nsStyleDisplay* kidDisplay;
rv = frame->GetStyleData(eStyleStruct_Display, rv = frame->GetStyleData(eStyleStruct_Display,
@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
nsIFrame* newFrame = aFrameList; nsIFrame* newFrame = aFrameList;
while (nsnull != newFrame) { while (nsnull != newFrame) {
nsIFrame* next; nsIFrame* next;
newFrame->GetNextSibling(next); newFrame->GetNextSibling(&next);
newFrame->SetNextSibling(nsnull); newFrame->SetNextSibling(nsnull);
const nsStyleDisplay* display; const nsStyleDisplay* display;
@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (frame == aPrevSibling) { if (frame == aPrevSibling) {
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
// Create new line to hold the remaining frames // Create new line to hold the remaining frames
NS_ASSERTION(n - i - 1 > 0, "bad line count"); NS_ASSERTION(n - i - 1 > 0, "bad line count");
@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
line->mChildCount = i + 1; line->mChildCount = i + 1;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Now create a new line to hold the block // Now create a new line to hold the block
@ -3370,7 +3370,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
// after the above logic because the above logic depends on the // after the above logic because the above logic depends on the
// sibling list being in the "before insertion" state. // sibling list being in the "before insertion" state.
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
newFrame->SetNextSibling(nextSibling); newFrame->SetNextSibling(nextSibling);
aPrevSibling->SetNextSibling(newFrame); aPrevSibling->SetNextSibling(newFrame);
} }
@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
goto found_frame; goto found_frame;
} }
prevSibling = frame; prevSibling = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
linep = &line->mNext; linep = &line->mNext;
prevLine = line; prevLine = line;
@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
NS_ASSERTION(nsnull != line, "can't find deleted frame in lines"); NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
if (nsnull != prevSibling) { if (nsnull != prevSibling) {
nsIFrame* tmp; nsIFrame* tmp;
prevSibling->GetNextSibling(tmp); prevSibling->GetNextSibling(&tmp);
NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling"); NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
} }
#endif #endif
@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// Get the deleted frames next sibling // Get the deleted frames next sibling
nsIFrame* nextFrame; nsIFrame* nextFrame;
aDeletedFrame->GetNextSibling(nextFrame); aDeletedFrame->GetNextSibling(&nextFrame);
// Remove aDeletedFrame from the line // Remove aDeletedFrame from the line
if (line->mFirstChild == aDeletedFrame) { if (line->mFirstChild == aDeletedFrame) {
@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
NS_RELEASE(tc); NS_RELEASE(tc);
NS_RELEASE(content); NS_RELEASE(content);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return PR_TRUE; return PR_TRUE;
} }
@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
PRInt32 n = line->ChildCount(); PRInt32 n = line->ChildCount();
while (--n >= 0) { while (--n >= 0) {
nsIFrame* nextChild; nsIFrame* nextChild;
child->GetNextSibling(nextChild); child->GetNextSibling(&nextChild);
if (child == aChild) { if (child == aChild) {
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS, NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("nsBlockFrame::RemoveChild: line=%p frame=%p", ("nsBlockFrame::RemoveChild: line=%p frame=%p",
@ -3921,7 +3921,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
break; break;
} }
@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
} }
@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
while (--n >= 0) { while (--n >= 0) {
PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
aWhichLayer); aWhichLayer);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
} }
@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLines = aLines->mNext; aLines = aLines->mNext;
} }
@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
return PR_FALSE; return PR_FALSE;
@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
} }
} }
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
block = (nsBlockFrame*) block->mNextInFlow; block = (nsBlockFrame*) block->mNextInFlow;
} }
@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
// therefore it will end an open text run. // therefore it will end an open text run.
ll.EndTextRun(); ll.EndTextRun();
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
else { else {
@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
// Remove frame from line and mark the line dirty // Remove frame from line and mark the line dirty
--line->mChildCount; --line->mChildCount;
line->MarkDirty(); line->MarkDirty();
firstChild->GetNextSibling(line->mFirstChild); firstChild->GetNextSibling(&line->mFirstChild);
} }
// Break linkage to next child after stolen frame // Break linkage to next child after stolen frame
@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
done = PR_TRUE; done = PR_TRUE;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
if (done) { if (done) {
break; break;

72
layout/html/base/src/nsBlockReflowState.cpp
View File

@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
nsIFrame* frame = aLine->mFirstChild; nsIFrame* frame = aLine->mFirstChild;
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while (--n >= 0) { while (--n >= 0) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
#endif #endif
@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while ((--n >= 0) && NS_SUCCEEDED(rv)) { while ((--n >= 0) && NS_SUCCEEDED(rv)) {
rv = child->ReResolveStyleContext(aPresContext, aStyleContext); rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
aLine = aLine->mNext; aLine = aLine->mNext;
} }
@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
else { else {
rv = child->ReResolveStyleContext(aPresContext, mStyleContext); rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
line = line->mNext; line = line->mNext;
} }
@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out); fputs("<\n", out);
while (nsnull != kid) { while (nsnull != kid) {
kid->List(out, aIndent + 1); kid->List(out, aIndent + 1);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
IndentBy(out, aIndent); IndentBy(out, aIndent);
fputs(">\n", out); fputs(">\n", out);
@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
while (--n >= 0) { while (--n >= 0) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
lastFrame->SetNextSibling(nsnull); lastFrame->SetNextSibling(nsnull);
@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
} }
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
if (0 != --fromLine->mChildCount) { if (0 != --fromLine->mChildCount) {
// Mark line dirty now that we pulled a child // Mark line dirty now that we pulled a child
fromLine->MarkDirty(); fromLine->MarkDirty();
frame->GetNextSibling(fromLine->mFirstChild); frame->GetNextSibling(&fromLine->mFirstChild);
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
@ -1908,7 +1908,7 @@ ListTag(stdout); printf(": SlideFrames: line=%p dy=%d\n", aDY);
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
// Adjust line state // Adjust line state
@ -1973,7 +1973,7 @@ ListTag(stdout); printf(": MoveInSpaceManager: d=%d,%d\n", aDeltaX, aDeltaY);
if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) { if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) {
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
line = line->mNext; line = line->mNext;
@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
nsIFrame* frame = aFrame; nsIFrame* frame = aFrame;
for (;;) { for (;;) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
frame->GetNextSibling(nextFrame); frame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
const nsStyleDisplay* display; const nsStyleDisplay* display;
nextFrame->GetStyleData(eStyleStruct_Display, nextFrame->GetStyleData(eStyleStruct_Display,
@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
// Push continuation to a new line, but only if we actually // Push continuation to a new line, but only if we actually
// made one. // made one.
if (madeContinuation) { if (madeContinuation) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK); nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
if (nsnull == line) { if (nsnull == line) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
} }
// Split line, but after the frame just reflowed // Split line, but after the frame just reflowed
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
if (needSplit) { if (needSplit) {
// Split line after the current frame // Split line after the current frame
aKeepLineGoing = PR_FALSE; aKeepLineGoing = PR_FALSE;
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
if (NS_OK != rv) { if (NS_OK != rv) {
return rv; return rv;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
return NS_OK; return NS_OK;
@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
PRInt32 n = aLine->ChildCount(); PRInt32 n = aLine->ChildCount();
while (--n >= 0) { while (--n >= 0) {
FindFloatersIn(frame, floaters); FindFloatersIn(frame, floaters);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLine->mFloaters = floaters; aLine->mFloaters = floaters;
@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
// Now create some lines for the new frames // Now create some lines for the new frames
nsIFrame* prevFrame = lastFrame; nsIFrame* prevFrame = lastFrame;
for (nsIFrame* frame = aNewFrame; nsnull != frame; for (nsIFrame* frame = aNewFrame; nsnull != frame;
frame->GetNextSibling(frame)) { frame->GetNextSibling(&frame)) {
// See if the child is a block or non-block // See if the child is a block or non-block
const nsStyleDisplay* kidDisplay; const nsStyleDisplay* kidDisplay;
rv = frame->GetStyleData(eStyleStruct_Display, rv = frame->GetStyleData(eStyleStruct_Display,
@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
nsIFrame* newFrame = aFrameList; nsIFrame* newFrame = aFrameList;
while (nsnull != newFrame) { while (nsnull != newFrame) {
nsIFrame* next; nsIFrame* next;
newFrame->GetNextSibling(next); newFrame->GetNextSibling(&next);
newFrame->SetNextSibling(nsnull); newFrame->SetNextSibling(nsnull);
const nsStyleDisplay* display; const nsStyleDisplay* display;
@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (frame == aPrevSibling) { if (frame == aPrevSibling) {
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
// Create new line to hold the remaining frames // Create new line to hold the remaining frames
NS_ASSERTION(n - i - 1 > 0, "bad line count"); NS_ASSERTION(n - i - 1 > 0, "bad line count");
@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
line->mChildCount = i + 1; line->mChildCount = i + 1;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Now create a new line to hold the block // Now create a new line to hold the block
@ -3370,7 +3370,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
// after the above logic because the above logic depends on the // after the above logic because the above logic depends on the
// sibling list being in the "before insertion" state. // sibling list being in the "before insertion" state.
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
newFrame->SetNextSibling(nextSibling); newFrame->SetNextSibling(nextSibling);
aPrevSibling->SetNextSibling(newFrame); aPrevSibling->SetNextSibling(newFrame);
} }
@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
goto found_frame; goto found_frame;
} }
prevSibling = frame; prevSibling = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
linep = &line->mNext; linep = &line->mNext;
prevLine = line; prevLine = line;
@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
NS_ASSERTION(nsnull != line, "can't find deleted frame in lines"); NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
if (nsnull != prevSibling) { if (nsnull != prevSibling) {
nsIFrame* tmp; nsIFrame* tmp;
prevSibling->GetNextSibling(tmp); prevSibling->GetNextSibling(&tmp);
NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling"); NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
} }
#endif #endif
@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// Get the deleted frames next sibling // Get the deleted frames next sibling
nsIFrame* nextFrame; nsIFrame* nextFrame;
aDeletedFrame->GetNextSibling(nextFrame); aDeletedFrame->GetNextSibling(&nextFrame);
// Remove aDeletedFrame from the line // Remove aDeletedFrame from the line
if (line->mFirstChild == aDeletedFrame) { if (line->mFirstChild == aDeletedFrame) {
@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
NS_RELEASE(tc); NS_RELEASE(tc);
NS_RELEASE(content); NS_RELEASE(content);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return PR_TRUE; return PR_TRUE;
} }
@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
PRInt32 n = line->ChildCount(); PRInt32 n = line->ChildCount();
while (--n >= 0) { while (--n >= 0) {
nsIFrame* nextChild; nsIFrame* nextChild;
child->GetNextSibling(nextChild); child->GetNextSibling(&nextChild);
if (child == aChild) { if (child == aChild) {
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS, NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("nsBlockFrame::RemoveChild: line=%p frame=%p", ("nsBlockFrame::RemoveChild: line=%p frame=%p",
@ -3921,7 +3921,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
break; break;
} }
@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
} }
@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
while (--n >= 0) { while (--n >= 0) {
PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
aWhichLayer); aWhichLayer);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
} }
@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLines = aLines->mNext; aLines = aLines->mNext;
} }
@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
return PR_FALSE; return PR_FALSE;
@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
} }
} }
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
block = (nsBlockFrame*) block->mNextInFlow; block = (nsBlockFrame*) block->mNextInFlow;
} }
@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
// therefore it will end an open text run. // therefore it will end an open text run.
ll.EndTextRun(); ll.EndTextRun();
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
else { else {
@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
// Remove frame from line and mark the line dirty // Remove frame from line and mark the line dirty
--line->mChildCount; --line->mChildCount;
line->MarkDirty(); line->MarkDirty();
firstChild->GetNextSibling(line->mFirstChild); firstChild->GetNextSibling(&line->mFirstChild);
} }
// Break linkage to next child after stolen frame // Break linkage to next child after stolen frame
@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
done = PR_TRUE; done = PR_TRUE;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
if (done) { if (done) {
break; break;

72
layout/html/base/src/nsBlockReflowState.h
View File

@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
nsIFrame* frame = aLine->mFirstChild; nsIFrame* frame = aLine->mFirstChild;
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while (--n >= 0) { while (--n >= 0) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
#endif #endif
@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
PRInt32 n = aLine->mChildCount; PRInt32 n = aLine->mChildCount;
while ((--n >= 0) && NS_SUCCEEDED(rv)) { while ((--n >= 0) && NS_SUCCEEDED(rv)) {
rv = child->ReResolveStyleContext(aPresContext, aStyleContext); rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
aLine = aLine->mNext; aLine = aLine->mNext;
} }
@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
else { else {
rv = child->ReResolveStyleContext(aPresContext, mStyleContext); rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
line = line->mNext; line = line->mNext;
} }
@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out); fputs("<\n", out);
while (nsnull != kid) { while (nsnull != kid) {
kid->List(out, aIndent + 1); kid->List(out, aIndent + 1);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
IndentBy(out, aIndent); IndentBy(out, aIndent);
fputs(">\n", out); fputs(">\n", out);
@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
while (--n >= 0) { while (--n >= 0) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
lastFrame->SetNextSibling(nsnull); lastFrame->SetNextSibling(nsnull);
@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
} }
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Pull frames and reflow them until we can't // Pull frames and reflow them until we can't
@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
if (0 != --fromLine->mChildCount) { if (0 != --fromLine->mChildCount) {
// Mark line dirty now that we pulled a child // Mark line dirty now that we pulled a child
fromLine->MarkDirty(); fromLine->MarkDirty();
frame->GetNextSibling(fromLine->mFirstChild); frame->GetNextSibling(&fromLine->mFirstChild);
} }
else { else {
// Free up the fromLine now that it's empty // Free up the fromLine now that it's empty
@ -1908,7 +1908,7 @@ ListTag(stdout); printf(": SlideFrames: line=%p dy=%d\n", aDY);
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, 0, aDY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
// Adjust line state // Adjust line state
@ -1973,7 +1973,7 @@ ListTag(stdout); printf(": MoveInSpaceManager: d=%d,%d\n", aDeltaX, aDeltaY);
if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) { if (NS_OK == kid->QueryInterface(kIHTMLReflowIID, (void**)&ihr)) {
ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY); ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
line = line->mNext; line = line->mNext;
@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
nsIFrame* frame = aFrame; nsIFrame* frame = aFrame;
for (;;) { for (;;) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
frame->GetNextSibling(nextFrame); frame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
const nsStyleDisplay* display; const nsStyleDisplay* display;
nextFrame->GetStyleData(eStyleStruct_Display, nextFrame->GetStyleData(eStyleStruct_Display,
@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
// Push continuation to a new line, but only if we actually // Push continuation to a new line, but only if we actually
// made one. // made one.
if (madeContinuation) { if (madeContinuation) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK); nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
if (nsnull == line) { if (nsnull == line) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
} }
// Split line, but after the frame just reflowed // Split line, but after the frame just reflowed
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
if (needSplit) { if (needSplit) {
// Split line after the current frame // Split line after the current frame
aKeepLineGoing = PR_FALSE; aKeepLineGoing = PR_FALSE;
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
rv = SplitLine(aState, aLine, aFrame); rv = SplitLine(aState, aLine, aFrame);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
return rv; return rv;
@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
if (NS_OK != rv) { if (NS_OK != rv) {
return rv; return rv;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
return NS_OK; return NS_OK;
@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
PRInt32 n = aLine->ChildCount(); PRInt32 n = aLine->ChildCount();
while (--n >= 0) { while (--n >= 0) {
FindFloatersIn(frame, floaters); FindFloatersIn(frame, floaters);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLine->mFloaters = floaters; aLine->mFloaters = floaters;
@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
// Now create some lines for the new frames // Now create some lines for the new frames
nsIFrame* prevFrame = lastFrame; nsIFrame* prevFrame = lastFrame;
for (nsIFrame* frame = aNewFrame; nsnull != frame; for (nsIFrame* frame = aNewFrame; nsnull != frame;
frame->GetNextSibling(frame)) { frame->GetNextSibling(&frame)) {
// See if the child is a block or non-block // See if the child is a block or non-block
const nsStyleDisplay* kidDisplay; const nsStyleDisplay* kidDisplay;
rv = frame->GetStyleData(eStyleStruct_Display, rv = frame->GetStyleData(eStyleStruct_Display,
@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
nsIFrame* newFrame = aFrameList; nsIFrame* newFrame = aFrameList;
while (nsnull != newFrame) { while (nsnull != newFrame) {
nsIFrame* next; nsIFrame* next;
newFrame->GetNextSibling(next); newFrame->GetNextSibling(&next);
newFrame->SetNextSibling(nsnull); newFrame->SetNextSibling(nsnull);
const nsStyleDisplay* display; const nsStyleDisplay* display;
@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (frame == aPrevSibling) { if (frame == aPrevSibling) {
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
// Create new line to hold the remaining frames // Create new line to hold the remaining frames
NS_ASSERTION(n - i - 1 > 0, "bad line count"); NS_ASSERTION(n - i - 1 > 0, "bad line count");
@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
line->mChildCount = i + 1; line->mChildCount = i + 1;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Now create a new line to hold the block // Now create a new line to hold the block
@ -3370,7 +3370,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
// after the above logic because the above logic depends on the // after the above logic because the above logic depends on the
// sibling list being in the "before insertion" state. // sibling list being in the "before insertion" state.
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevSibling->GetNextSibling(nextSibling); aPrevSibling->GetNextSibling(&nextSibling);
newFrame->SetNextSibling(nextSibling); newFrame->SetNextSibling(nextSibling);
aPrevSibling->SetNextSibling(newFrame); aPrevSibling->SetNextSibling(newFrame);
} }
@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
goto found_frame; goto found_frame;
} }
prevSibling = frame; prevSibling = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
linep = &line->mNext; linep = &line->mNext;
prevLine = line; prevLine = line;
@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
NS_ASSERTION(nsnull != line, "can't find deleted frame in lines"); NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
if (nsnull != prevSibling) { if (nsnull != prevSibling) {
nsIFrame* tmp; nsIFrame* tmp;
prevSibling->GetNextSibling(tmp); prevSibling->GetNextSibling(&tmp);
NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling"); NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
} }
#endif #endif
@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
// Get the deleted frames next sibling // Get the deleted frames next sibling
nsIFrame* nextFrame; nsIFrame* nextFrame;
aDeletedFrame->GetNextSibling(nextFrame); aDeletedFrame->GetNextSibling(&nextFrame);
// Remove aDeletedFrame from the line // Remove aDeletedFrame from the line
if (line->mFirstChild == aDeletedFrame) { if (line->mFirstChild == aDeletedFrame) {
@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
NS_RELEASE(tc); NS_RELEASE(tc);
NS_RELEASE(content); NS_RELEASE(content);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return PR_TRUE; return PR_TRUE;
} }
@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
PRInt32 n = line->ChildCount(); PRInt32 n = line->ChildCount();
while (--n >= 0) { while (--n >= 0) {
nsIFrame* nextChild; nsIFrame* nextChild;
child->GetNextSibling(nextChild); child->GetNextSibling(&nextChild);
if (child == aChild) { if (child == aChild) {
NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS, NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
("nsBlockFrame::RemoveChild: line=%p frame=%p", ("nsBlockFrame::RemoveChild: line=%p frame=%p",
@ -3921,7 +3921,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
break; break;
} }
@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
// We found a non-zero sized child frame that precedes aFrame // We found a non-zero sized child frame that precedes aFrame
return PR_FALSE; return PR_FALSE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
} }
@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
while (--n >= 0) { while (--n >= 0) {
PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
aWhichLayer); aWhichLayer);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
} }
@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
aLines = aLines->mNext; aLines = aLines->mNext;
} }
@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
return PR_FALSE; return PR_FALSE;
@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
} }
} }
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
block = (nsBlockFrame*) block->mNextInFlow; block = (nsBlockFrame*) block->mNextInFlow;
} }
@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
// therefore it will end an open text run. // therefore it will end an open text run.
ll.EndTextRun(); ll.EndTextRun();
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
else { else {
@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(this); frame->SetParent(this);
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Join the line lists // Join the line lists
@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
// Remove frame from line and mark the line dirty // Remove frame from line and mark the line dirty
--line->mChildCount; --line->mChildCount;
line->MarkDirty(); line->MarkDirty();
firstChild->GetNextSibling(line->mFirstChild); firstChild->GetNextSibling(&line->mFirstChild);
} }
// Break linkage to next child after stolen frame // Break linkage to next child after stolen frame
@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
done = PR_TRUE; done = PR_TRUE;
break; break;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
if (done) { if (done) {
break; break;

24
layout/html/base/src/nsContainerFrame.cpp
View File

@ -102,7 +102,7 @@ nsContainerFrame::DidReflow(nsIPresContext& aPresContext,
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
htmlReflow->DidReflow(aPresContext, aStatus); htmlReflow->DidReflow(aPresContext, aStatus);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
NS_IF_RELEASE(listName); NS_IF_RELEASE(listName);
GetAdditionalChildListName(listIndex++, &listName); GetAdditionalChildListName(listIndex++, &listName);
@ -148,14 +148,14 @@ nsContainerFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
result = FirstChild(nsnull, &child); result = FirstChild(nsnull, &child);
while ((NS_SUCCEEDED(result)) && (nsnull != child)) { while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
result = child->ReResolveStyleContext(aPresContext, mStyleContext); result = child->ReResolveStyleContext(aPresContext, mStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
// Update overflow list too // Update overflow list too
child = mOverflowFrames.FirstChild(); child = mOverflowFrames.FirstChild();
while ((NS_SUCCEEDED(result)) && (nsnull != child)) { while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
result = child->ReResolveStyleContext(aPresContext, mStyleContext); result = child->ReResolveStyleContext(aPresContext, mStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
// And just to be complete, update our prev-in-flows overflow list // And just to be complete, update our prev-in-flows overflow list
@ -164,7 +164,7 @@ nsContainerFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
child = ((nsContainerFrame*)mPrevInFlow)->mOverflowFrames.FirstChild(); child = ((nsContainerFrame*)mPrevInFlow)->mOverflowFrames.FirstChild();
while ((NS_SUCCEEDED(result)) && (nsnull != child)) { while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
result = child->ReResolveStyleContext(aPresContext, mStyleContext); result = child->ReResolveStyleContext(aPresContext, mStyleContext);
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
} }
} }
@ -214,7 +214,7 @@ nsContainerFrame::PaintChildren(nsIPresContext& aPresContext,
nsIFrame* kid = mFrames.FirstChild(); nsIFrame* kid = mFrames.FirstChild();
while (nsnull != kid) { while (nsnull != kid) {
PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer); PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
if (NS_STYLE_OVERFLOW_HIDDEN == disp->mOverflow) { if (NS_STYLE_OVERFLOW_HIDDEN == disp->mOverflow) {
@ -312,7 +312,7 @@ nsContainerFrame::GetFrameForPointUsing(const nsPoint& aPoint,
tmp.MoveTo(aPoint.x - kidRect.x, aPoint.y - kidRect.y); tmp.MoveTo(aPoint.x - kidRect.x, aPoint.y - kidRect.y);
return kid->GetFrameForPoint(tmp, aFrame); return kid->GetFrameForPoint(tmp, aFrame);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
FirstChild(aList, &kid); FirstChild(aList, &kid);
@ -326,7 +326,7 @@ nsContainerFrame::GetFrameForPointUsing(const nsPoint& aPoint,
return NS_OK; return NS_OK;
} }
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
*aFrame = this; *aFrame = this;
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -419,7 +419,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
// Take the next-in-flow out of the parent's child list // Take the next-in-flow out of the parent's child list
if (parent->mFrames.FirstChild() == nextInFlow) { if (parent->mFrames.FirstChild() == nextInFlow) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
nextInFlow->GetNextSibling(nextFrame); nextInFlow->GetNextSibling(&nextFrame);
parent->mFrames.SetFrames(nextFrame); parent->mFrames.SetFrames(nextFrame);
} else { } else {
nsIFrame* nextSibling; nsIFrame* nextSibling;
@ -430,10 +430,10 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
// next-in-flow is the last next-in-flow for aChild AND the // next-in-flow is the last next-in-flow for aChild AND the
// next-in-flow is not the last child in parent) // next-in-flow is not the last child in parent)
NS_ASSERTION(((nsContainerFrame*)parent)->IsChild(aChild), "screwy flow"); NS_ASSERTION(((nsContainerFrame*)parent)->IsChild(aChild), "screwy flow");
aChild->GetNextSibling(nextSibling); aChild->GetNextSibling(&nextSibling);
NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling"); NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling");
nextInFlow->GetNextSibling(nextSibling); nextInFlow->GetNextSibling(&nextSibling);
aChild->SetNextSibling(nextSibling); aChild->SetNextSibling(nextSibling);
} }
@ -467,7 +467,7 @@ nsContainerFrame::PushChildren(nsIFrame* aFromChild, nsIFrame* aPrevSibling)
NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child"); NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child");
#ifdef NS_DEBUG #ifdef NS_DEBUG
nsIFrame* prevNextSibling; nsIFrame* prevNextSibling;
aPrevSibling->GetNextSibling(prevNextSibling); aPrevSibling->GetNextSibling(&prevNextSibling);
NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling"); NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling");
#endif #endif
@ -620,7 +620,7 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent) const
fputs("<\n", out); fputs("<\n", out);
while (nsnull != kid) { while (nsnull != kid) {
kid->List(out, aIndent + 1); kid->List(out, aIndent + 1);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
IndentBy(out, aIndent); IndentBy(out, aIndent);
fputs(">\n", out); fputs(">\n", out);

11
layout/html/base/src/nsFrame.cpp
View File

@ -1576,9 +1576,10 @@ NS_IMETHODIMP nsFrame::GetAutoMarginSize(PRUint8 aSide, nscoord& aSize) const
// Sibling pointer used to link together frames // Sibling pointer used to link together frames
NS_IMETHODIMP nsFrame::GetNextSibling(nsIFrame*& aNextSibling) const NS_IMETHODIMP nsFrame::GetNextSibling(nsIFrame** aNextSibling) const
{ {
aNextSibling = mNextSibling; NS_PRECONDITION(nsnull != aNextSibling, "null OUT parameter pointer");
*aNextSibling = mNextSibling;
return NS_OK; return NS_OK;
} }
@ -1777,7 +1778,7 @@ nsFrame::DumpBaseRegressionData(FILE* out, PRInt32 aIndent)
aIndent++; aIndent++;
while (nsnull != kid) { while (nsnull != kid) {
kid->DumpRegressionData(out, aIndent); kid->DumpRegressionData(out, aIndent);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
aIndent--; aIndent--;
IndentBy(out, aIndent); IndentBy(out, aIndent);
@ -1833,7 +1834,7 @@ nsFrame::SetSelectedContentOffsets(PRBool aSelected, PRInt32 aBeginContentOffset
aForceRedraw , aTracker, aActualSelected); aForceRedraw , aTracker, aActualSelected);
if (NS_SUCCEEDED(result) && aActualSelected) if (NS_SUCCEEDED(result) && aActualSelected)
return result; //done. return result; //done.
result |= child->GetNextSibling(child); result |= child->GetNextSibling(&child);
} }
return result; return result;
} }
@ -1956,7 +1957,7 @@ static void RefreshAllContentFrames(nsIFrame * aFrame, nsIContent * aContent)
aFrame->FirstChild(nsnull, &aFrame); aFrame->FirstChild(nsnull, &aFrame);
while (aFrame) { while (aFrame) {
RefreshAllContentFrames(aFrame, aContent); RefreshAllContentFrames(aFrame, aContent);
aFrame->GetNextSibling(aFrame); aFrame->GetNextSibling(&aFrame);
} }
} }

2
layout/html/base/src/nsFrame.h
View File

@ -194,7 +194,7 @@ public:
NS_IMETHOD GetFrameType(nsIAtom** aType) const; NS_IMETHOD GetFrameType(nsIAtom** aType) const;
NS_IMETHOD IsPercentageBase(PRBool& aBase) const; NS_IMETHOD IsPercentageBase(PRBool& aBase) const;
NS_IMETHOD GetAutoMarginSize(PRUint8 aSide, nscoord& aSize) const; NS_IMETHOD GetAutoMarginSize(PRUint8 aSide, nscoord& aSize) const;
NS_IMETHOD GetNextSibling(nsIFrame*& aNextSibling) const; NS_IMETHOD GetNextSibling(nsIFrame** aNextSibling) const;
NS_IMETHOD SetNextSibling(nsIFrame* aNextSibling); NS_IMETHOD SetNextSibling(nsIFrame* aNextSibling);
NS_IMETHOD IsTransparent(PRBool& aTransparent) const; NS_IMETHOD IsTransparent(PRBool& aTransparent) const;
NS_IMETHOD Scrolled(nsIView *aView); NS_IMETHOD Scrolled(nsIView *aView);

32
layout/html/base/src/nsFrameList.cpp
View File

@ -25,7 +25,7 @@ nsFrameList::DeleteFrames(nsIPresContext& aPresContext)
nsIFrame* frame = mFirstChild; nsIFrame* frame = mFirstChild;
while (nsnull != frame) { while (nsnull != frame) {
nsIFrame* next; nsIFrame* next;
frame->GetNextSibling(next); frame->GetNextSibling(&next);
frame->DeleteFrame(aPresContext); frame->DeleteFrame(aPresContext);
mFirstChild = frame = next; mFirstChild = frame = next;
} }
@ -47,7 +47,7 @@ nsFrameList::AppendFrames(nsIFrame* aParent, nsIFrame* aFrameList)
nsIFrame* frame = aFrameList; nsIFrame* frame = aFrameList;
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(aParent); frame->SetParent(aParent);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
} }
@ -77,7 +77,7 @@ nsFrameList::RemoveFrame(nsIFrame* aFrame)
NS_PRECONDITION(nsnull != aFrame, "null ptr"); NS_PRECONDITION(nsnull != aFrame, "null ptr");
if (nsnull != aFrame) { if (nsnull != aFrame) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
aFrame->GetNextSibling(nextFrame); aFrame->GetNextSibling(&nextFrame);
aFrame->SetNextSibling(nsnull); aFrame->SetNextSibling(nsnull);
if (aFrame == mFirstChild) { if (aFrame == mFirstChild) {
mFirstChild = nextFrame; mFirstChild = nextFrame;
@ -99,7 +99,7 @@ nsFrameList::RemoveFirstChild()
{ {
if (nsnull != mFirstChild) { if (nsnull != mFirstChild) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
mFirstChild->GetNextSibling(nextFrame); mFirstChild->GetNextSibling(&nextFrame);
mFirstChild->SetNextSibling(nsnull); mFirstChild->SetNextSibling(nsnull);
mFirstChild = nextFrame; mFirstChild = nextFrame;
return PR_TRUE; return PR_TRUE;
@ -131,7 +131,7 @@ nsFrameList::InsertFrame(nsIFrame* aParent,
} }
else { else {
nsIFrame* nextFrame; nsIFrame* nextFrame;
aPrevSibling->GetNextSibling(nextFrame); aPrevSibling->GetNextSibling(&nextFrame);
aPrevSibling->SetNextSibling(aNewFrame); aPrevSibling->SetNextSibling(aNewFrame);
aNewFrame->SetNextSibling(nextFrame); aNewFrame->SetNextSibling(nextFrame);
} }
@ -152,7 +152,7 @@ nsFrameList::InsertFrames(nsIFrame* aParent,
nsIFrame* frame = aFrameList; nsIFrame* frame = aFrameList;
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(aParent); frame->SetParent(aParent);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
@ -164,7 +164,7 @@ nsFrameList::InsertFrames(nsIFrame* aParent,
} }
else { else {
nsIFrame* nextFrame; nsIFrame* nextFrame;
aPrevSibling->GetNextSibling(nextFrame); aPrevSibling->GetNextSibling(&nextFrame);
aPrevSibling->SetNextSibling(aFrameList); aPrevSibling->SetNextSibling(aFrameList);
lastNewFrame->SetNextSibling(nextFrame); lastNewFrame->SetNextSibling(nextFrame);
} }
@ -180,7 +180,7 @@ nsFrameList::ReplaceFrame(nsIFrame* aParent,
NS_PRECONDITION(nsnull != aNewFrame, "null ptr"); NS_PRECONDITION(nsnull != aNewFrame, "null ptr");
if ((nsnull != aOldFrame) && (nsnull != aNewFrame)) { if ((nsnull != aOldFrame) && (nsnull != aNewFrame)) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
aOldFrame->GetNextSibling(nextFrame); aOldFrame->GetNextSibling(&nextFrame);
if (aOldFrame == mFirstChild) { if (aOldFrame == mFirstChild) {
mFirstChild = aNewFrame; mFirstChild = aNewFrame;
aNewFrame->SetNextSibling(nextFrame); aNewFrame->SetNextSibling(nextFrame);
@ -224,7 +224,7 @@ nsFrameList::Split(nsIFrame* aAfterFrame, nsIFrame** aNextFrameResult)
if ((nsnull != aNextFrameResult) && (nsnull != aAfterFrame)) { if ((nsnull != aNextFrameResult) && (nsnull != aAfterFrame)) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
aAfterFrame->GetNextSibling(nextFrame); aAfterFrame->GetNextSibling(&nextFrame);
aAfterFrame->SetNextSibling(nsnull); aAfterFrame->SetNextSibling(nsnull);
*aNextFrameResult = nextFrame; *aNextFrameResult = nextFrame;
return PR_TRUE; return PR_TRUE;
@ -266,7 +266,7 @@ nsFrameList::LastChild() const
nsIFrame* frame = mFirstChild; nsIFrame* frame = mFirstChild;
while (nsnull != frame) { while (nsnull != frame) {
nsIFrame* next; nsIFrame* next;
frame->GetNextSibling(next); frame->GetNextSibling(&next);
if (nsnull == next) { if (nsnull == next) {
break; break;
} }
@ -282,7 +282,7 @@ nsFrameList::FrameAt(PRInt32 aIndex) const
if (aIndex < 0) return nsnull; if (aIndex < 0) return nsnull;
nsIFrame* frame = mFirstChild; nsIFrame* frame = mFirstChild;
while ((aIndex-- > 0) && (nsnull != frame)) { while ((aIndex-- > 0) && (nsnull != frame)) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return frame; return frame;
} }
@ -296,7 +296,7 @@ nsFrameList::ContainsFrame(const nsIFrame* aFrame) const
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return PR_FALSE; return PR_FALSE;
} }
@ -308,7 +308,7 @@ nsFrameList::GetLength() const
nsIFrame* frame = mFirstChild; nsIFrame* frame = mFirstChild;
while (nsnull != frame) { while (nsnull != frame) {
count++; count++;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return count; return count;
} }
@ -323,7 +323,7 @@ nsFrameList::GetPrevSiblingFor(nsIFrame* aFrame) const
nsIFrame* frame = mFirstChild; nsIFrame* frame = mFirstChild;
while (nsnull != frame) { while (nsnull != frame) {
nsIFrame* next; nsIFrame* next;
frame->GetNextSibling(next); frame->GetNextSibling(&next);
if (next == aFrame) { if (next == aFrame) {
break; break;
} }
@ -341,7 +341,7 @@ nsFrameList::VerifyParent(nsIFrame* aParent) const
nsIFrame* parent; nsIFrame* parent;
frame->GetParent(&parent); frame->GetParent(&parent);
NS_ASSERTION(parent == aParent, "bad parent"); NS_ASSERTION(parent == aParent, "bad parent");
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
#endif #endif
} }
@ -355,7 +355,7 @@ nsFrameList::List(FILE* out) const
frame->List(out, 1); frame->List(out, 1);
// nsFrame::ListTag(out, frame); // nsFrame::ListTag(out, frame);
// fputs(" ", out); // fputs(" ", out);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
fputs("\n", out); fputs("\n", out);
} }

4
layout/html/base/src/nsHTMLContainerFrame.cpp
View File

@ -123,7 +123,7 @@ nsHTMLContainerFrame::MoveFrameOutOfFlow(nsIPresContext& aPresContext,
// Set aFrame's next sibling to nsnull, and remember the current next // Set aFrame's next sibling to nsnull, and remember the current next
// sibling pointer // sibling pointer
aFrame->GetNextSibling(nextSibling); aFrame->GetNextSibling(&nextSibling);
aFrame->SetNextSibling(nsnull); aFrame->SetNextSibling(nsnull);
// Create a placeholder frame that will serve as the anchor point. // Create a placeholder frame that will serve as the anchor point.
@ -157,7 +157,7 @@ nsHTMLContainerFrame::CreateNextInFlow(nsIPresContext& aPresContext,
// Create a continuation frame for the child frame and insert it // Create a continuation frame for the child frame and insert it
// into our lines child list. // into our lines child list.
nsIFrame* nextFrame; nsIFrame* nextFrame;
aFrame->GetNextSibling(nextFrame); aFrame->GetNextSibling(&nextFrame);
nsIStyleContext* kidSC; nsIStyleContext* kidSC;
aFrame->GetStyleContext(&kidSC); aFrame->GetStyleContext(&kidSC);
aFrame->CreateContinuingFrame(aPresContext, aOuterFrame, aFrame->CreateContinuingFrame(aPresContext, aOuterFrame,

38
layout/html/base/src/nsInlineFrame.cpp
View File

@ -239,7 +239,7 @@ nsInlineFrame::SectionData::SectionData(nsIFrame* aFrameList)
} }
} }
lastFrame = frame; lastFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
@ -264,7 +264,7 @@ nsInlineFrame::SectionData::SplitFrameList(nsFrameList& aSection1,
if (lastFrame != lastBlock) { if (lastFrame != lastBlock) {
// There are inline frames that follow the last block. Setup section3. // There are inline frames that follow the last block. Setup section3.
nsIFrame* remainder; nsIFrame* remainder;
lastBlock->GetNextSibling(remainder); lastBlock->GetNextSibling(&remainder);
lastBlock->SetNextSibling(nsnull); lastBlock->SetNextSibling(nsnull);
aSection3.SetFrames(remainder); aSection3.SetFrames(remainder);
} }
@ -346,7 +346,7 @@ nsInlineFrame::MoveOutOfFlow(nsIPresContext& aPresContext,
frame = placeholder; frame = placeholder;
} }
prevFrame = frame; prevFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return NS_OK; return NS_OK;
} }
@ -367,7 +367,7 @@ nsInlineFrame::FindPrevAnonymousBlock(nsInlineFrame** aBlockParent)
*aBlockParent = prevInFlow; *aBlockParent = prevInFlow;
return (nsAnonymousBlockFrame*) frame; return (nsAnonymousBlockFrame*) frame;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
prevInFlow = (nsInlineFrame*) prevInFlow->mPrevInFlow; prevInFlow = (nsInlineFrame*) prevInFlow->mPrevInFlow;
} }
@ -390,7 +390,7 @@ nsInlineFrame::FindAnonymousBlock(nsInlineFrame** aBlockParent)
*aBlockParent = nextInFlow; *aBlockParent = nextInFlow;
return (nsAnonymousBlockFrame*) frame; return (nsAnonymousBlockFrame*) frame;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
nextInFlow = (nsInlineFrame*) nextInFlow->mNextInFlow; nextInFlow = (nsInlineFrame*) nextInFlow->mNextInFlow;
} }
@ -421,7 +421,7 @@ nsInlineFrame::CreateAnonymousBlock(nsIPresContext& aPresContext,
nsIFrame* frame = aInitialFrames; nsIFrame* frame = aInitialFrames;
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(bf); frame->SetParent(bf);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
rv = bf->SetInitialChildList(aPresContext, nsnull, aInitialFrames); rv = bf->SetInitialChildList(aPresContext, nsnull, aInitialFrames);
} }
@ -504,7 +504,7 @@ nsInlineFrame::AppendFrames(nsIPresContext& aPresContext,
// this frame, stealing children from our continuation frames as // this frame, stealing children from our continuation frames as
// necessary. // necessary.
nsIFrame* inlineSiblings; nsIFrame* inlineSiblings;
anonymousBlock->GetNextSibling(inlineSiblings); anonymousBlock->GetNextSibling(&inlineSiblings);
nsFrameList newBlockFrames; nsFrameList newBlockFrames;
if (nsnull != inlineSiblings) { if (nsnull != inlineSiblings) {
newBlockFrames.AppendFrames(anonymousBlock, inlineSiblings); newBlockFrames.AppendFrames(anonymousBlock, inlineSiblings);
@ -715,7 +715,7 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext,
nsIFrame* frame = aFrameList; nsIFrame* frame = aFrameList;
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(prevFrameParent); frame->SetParent(prevFrameParent);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
nsAnonymousBlockFrame* anonymousBlock; nsAnonymousBlockFrame* anonymousBlock;
anonymousBlock = (nsAnonymousBlockFrame*) prevFrameParent; anonymousBlock = (nsAnonymousBlockFrame*) prevFrameParent;
@ -872,7 +872,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
// frames into the anonymous block if they should be in // frames into the anonymous block if they should be in
// section3. // section3.
nsIFrame* nextSibling; nsIFrame* nextSibling;
aPrevFrame->GetNextSibling(nextSibling); aPrevFrame->GetNextSibling(&nextSibling);
nsIFrame* anonymousBlockNextInFlow; nsIFrame* anonymousBlockNextInFlow;
prevFrameParent->GetNextInFlow(anonymousBlockNextInFlow); prevFrameParent->GetNextInFlow(anonymousBlockNextInFlow);
if ((nsnull != nextSibling) || (nsnull != anonymousBlockNextInFlow)) { if ((nsnull != nextSibling) || (nsnull != anonymousBlockNextInFlow)) {
@ -881,7 +881,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
nsIFrame* frame = aFrameList; nsIFrame* frame = aFrameList;
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(anonymousBlock); frame->SetParent(anonymousBlock);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
anonymousBlock->InsertFrames2(aPresContext, aPresShell, nsnull, anonymousBlock->InsertFrames2(aPresContext, aPresShell, nsnull,
aPrevFrame, aFrameList); aPrevFrame, aFrameList);
@ -899,7 +899,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
nsIFrame* frame = aFrameList; nsIFrame* frame = aFrameList;
while (nsnull != frame) { while (nsnull != frame) {
frame->SetParent(anonymousBlockParent); frame->SetParent(anonymousBlockParent);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
anonymousBlockParent->mFrames.InsertFrames(nsnull, anonymousBlock, anonymousBlockParent->mFrames.InsertFrames(nsnull, anonymousBlock,
aFrameList); aFrameList);
@ -1001,7 +1001,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
// last block in the anonymous block. // last block in the anonymous block.
anonymousBlock->GetNextInFlow(nextInFlow); anonymousBlock->GetNextInFlow(nextInFlow);
nsIFrame* nextSib; nsIFrame* nextSib;
aOldFrame->GetNextSibling(nextSib); aOldFrame->GetNextSibling(&nextSib);
if ((nsnull != nextInFlow) || (nsnull != nextSib)) { if ((nsnull != nextInFlow) || (nsnull != nextSib)) {
// There is a block in the anonymous block after the block // There is a block in the anonymous block after the block
// that we are removing. This means that we can let the // that we are removing. This means that we can let the
@ -1051,7 +1051,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
SectionData sd(kids); SectionData sd(kids);
if (sd.HasABlock()) { if (sd.HasABlock()) {
kids = sd.lastBlock; kids = sd.lastBlock;
kids->GetNextSibling(kids); kids->GetNextSibling(&kids);
if (nsnull != kids) { if (nsnull != kids) {
// Take the frames that follow the last block // Take the frames that follow the last block
// (which are inline frames) and remove them from // (which are inline frames) and remove them from
@ -1127,7 +1127,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
break; break;
} }
nsIFrame* next; nsIFrame* next;
kid->GetNextSibling(next); kid->GetNextSibling(&next);
anonymousBlock->RemoveFirstFrame(); anonymousBlock->RemoveFirstFrame();
frames.AppendFrame(nsnull, kid); frames.AppendFrame(nsnull, kid);
kid = next; kid = next;
@ -1354,7 +1354,7 @@ nsInlineFrame::ReflowInlineFrames(ReflowState& rs,
break; break;
} }
rs.prevFrame = frame; rs.prevFrame = frame;
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Attempt to pull frames from our next-in-flow until we can't // Attempt to pull frames from our next-in-flow until we can't
@ -1453,7 +1453,7 @@ nsInlineFrame::ReflowInlineFrame(ReflowState& rs,
} }
} }
nsIFrame* nextFrame; nsIFrame* nextFrame;
aFrame->GetNextSibling(nextFrame); aFrame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
aStatus |= NS_FRAME_NOT_COMPLETE; aStatus |= NS_FRAME_NOT_COMPLETE;
PushFrames(nextFrame, aFrame); PushFrames(nextFrame, aFrame);
@ -1479,7 +1479,7 @@ nsInlineFrame::ReflowInlineFrame(ReflowState& rs,
return rv; return rv;
} }
nsIFrame* nextFrame; nsIFrame* nextFrame;
aFrame->GetNextSibling(nextFrame); aFrame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
PushFrames(nextFrame, aFrame); PushFrames(nextFrame, aFrame);
} }
@ -1559,7 +1559,7 @@ nsInlineFrame::PushFrames(nsIFrame* aFromChild, nsIFrame* aPrevSibling)
NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child"); NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child");
#ifdef NS_DEBUG #ifdef NS_DEBUG
nsIFrame* prevNextSibling; nsIFrame* prevNextSibling;
aPrevSibling->GetNextSibling(prevNextSibling); aPrevSibling->GetNextSibling(&prevNextSibling);
NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling"); NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling");
#endif #endif
@ -1637,7 +1637,7 @@ nsInlineFrame::ReflowBlockFrame(ReflowState& rs,
// inline frames. Make sure we reflect that in our reflow status // inline frames. Make sure we reflect that in our reflow status
// and push them to our next-in-flow. // and push them to our next-in-flow.
nsIFrame* nextFrame; nsIFrame* nextFrame;
blockFrame->GetNextSibling(nextFrame); blockFrame->GetNextSibling(&nextFrame);
if (nsnull != nextFrame) { if (nsnull != nextFrame) {
PushFrames(nextFrame, blockFrame); PushFrames(nextFrame, blockFrame);
aStatus |= NS_FRAME_NOT_COMPLETE; aStatus |= NS_FRAME_NOT_COMPLETE;

2
layout/html/base/src/nsInlineReflow.cpp
View File

@ -961,7 +961,7 @@ nsInlineReflow::HorizontalAlignFrames(nsRect& aLineBox, PRBool aAllowJustify)
nsIFrame* kid = pfd->mFrame;; nsIFrame* kid = pfd->mFrame;;
kid->GetOrigin(origin); kid->GetOrigin(origin);
kid->MoveTo(origin.x + dx, origin.y); kid->MoveTo(origin.x + dx, origin.y);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
} }

8
layout/html/base/src/nsLineBox.cpp
View File

@ -94,7 +94,7 @@ nsLineBox::List(FILE* out, PRInt32 aIndent) const
PRInt32 n = ChildCount(); PRInt32 n = ChildCount();
while (--n >= 0) { while (--n >= 0) {
frame->List(out, aIndent + 1); frame->List(out, aIndent + 1);
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
for (i = aIndent; --i >= 0; ) fputs(" ", out); for (i = aIndent; --i >= 0; ) fputs(" ", out);
@ -112,7 +112,7 @@ nsLineBox::LastChild() const
nsIFrame* frame = mFirstChild; nsIFrame* frame = mFirstChild;
PRInt32 n = ChildCount() - 1; PRInt32 n = ChildCount() - 1;
while (--n >= 0) { while (--n >= 0) {
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return frame; return frame;
} }
@ -133,7 +133,7 @@ nsLineBox::Contains(nsIFrame* aFrame) const
if (frame == aFrame) { if (frame == aFrame) {
return PR_TRUE; return PR_TRUE;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
return PR_FALSE; return PR_FALSE;
} }
@ -223,7 +223,7 @@ nsLineBox::DeleteLineList(nsIPresContext& aPresContext, nsLineBox* aLine)
// view. // view.
for (nsIFrame* child = aLine->mFirstChild; child; ) { for (nsIFrame* child = aLine->mFirstChild; child; ) {
nsIFrame* nextChild; nsIFrame* nextChild;
child->GetNextSibling(nextChild); child->GetNextSibling(&nextChild);
child->DeleteFrame(aPresContext); child->DeleteFrame(aPresContext);
child = nextChild; child = nextChild;
} }

6
layout/html/base/src/nsPresShell.cpp
View File

@ -1408,7 +1408,7 @@ FindFrameWithContent(nsIFrame* aFrame, nsIContent* aContent)
NS_IF_RELEASE(listName); NS_IF_RELEASE(listName);
return result; return result;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
NS_IF_RELEASE(listName); NS_IF_RELEASE(listName);
aFrame->GetAdditionalChildListName(listIndex++, &listName); aFrame->GetAdditionalChildListName(listIndex++, &listName);
@ -1732,8 +1732,8 @@ CompareTrees(nsIFrame* aA, nsIFrame* aB)
CompareTrees(k1, k2); CompareTrees(k1, k2);
// Advance to next sibling // Advance to next sibling
k1->GetNextSibling(k1); k1->GetNextSibling(&k1);
k2->GetNextSibling(k2); k2->GetNextSibling(&k2);
} }
else { else {
break; break;

12
layout/html/base/src/nsSimplePageSequence.cpp
View File

@ -88,7 +88,7 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext& aPresContext,
// Compute the y-offset of this page // Compute the y-offset of this page
for (nsIFrame* f = mFrames.FirstChild(); f != nextFrame; for (nsIFrame* f = mFrames.FirstChild(); f != nextFrame;
f->GetNextSibling(f)) { f->GetNextSibling(&f)) {
nsSize size; nsSize size;
f->GetSize(size); f->GetSize(size);
@ -111,13 +111,13 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext& aPresContext,
// XXX Check if the page is complete... // XXX Check if the page is complete...
// Update the y-offset to reflect the remaining pages // Update the y-offset to reflect the remaining pages
nextFrame->GetNextSibling(nextFrame); nextFrame->GetNextSibling(&nextFrame);
while (nsnull != nextFrame) { while (nsnull != nextFrame) {
nsSize size; nsSize size;
nextFrame->GetSize(size); nextFrame->GetSize(size);
y += size.height + PAGE_SPACING_TWIPS; y += size.height + PAGE_SPACING_TWIPS;
nextFrame->GetNextSibling(nextFrame); nextFrame->GetNextSibling(&nextFrame);
} }
} else { } else {
@ -163,14 +163,14 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext& aPresContext,
// Add it to our child list // Add it to our child list
#ifdef NS_DEBUG #ifdef NS_DEBUG
nsIFrame* kidNextSibling; nsIFrame* kidNextSibling;
kidFrame->GetNextSibling(kidNextSibling); kidFrame->GetNextSibling(&kidNextSibling);
NS_ASSERTION(nsnull == kidNextSibling, "unexpected sibling"); NS_ASSERTION(nsnull == kidNextSibling, "unexpected sibling");
#endif #endif
kidFrame->SetNextSibling(continuingPage); kidFrame->SetNextSibling(continuingPage);
} }
// Get the next page // Get the next page
kidFrame->GetNextSibling(kidFrame); kidFrame->GetNextSibling(&kidFrame);
} }
} }
@ -276,7 +276,7 @@ nsSimplePageSequenceFrame::Print(nsIPresContext& aPresContext,
// Print each specified page // Print each specified page
PRInt32 pageNum = 1; PRInt32 pageNum = 1;
for (nsIFrame* page = mFrames.FirstChild(); nsnull != page; page->GetNextSibling(page)) { for (nsIFrame* page = mFrames.FirstChild(); nsnull != page; page->GetNextSibling(&page)) {
// See whether we should print this page // See whether we should print this page
PRBool printThisPage = PR_TRUE; PRBool printThisPage = PR_TRUE;

4
layout/html/base/src/nsViewportFrame.cpp
View File

@ -264,7 +264,7 @@ ViewportFrame::ReflowFixedFrames(nsIPresContext& aPresContext,
reflowState.computedHeight = height; reflowState.computedHeight = height;
nsIFrame* kidFrame; nsIFrame* kidFrame;
for (kidFrame = mFixedFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) { for (kidFrame = mFixedFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
// Reflow the frame using our reflow reason // Reflow the frame using our reflow reason
nsReflowStatus kidStatus; nsReflowStatus kidStatus;
ReflowFixedFrame(aPresContext, reflowState, kidFrame, PR_FALSE, kidStatus); ReflowFixedFrame(aPresContext, reflowState, kidFrame, PR_FALSE, kidStatus);
@ -338,7 +338,7 @@ ViewportFrame::IncrementalReflow(nsIPresContext& aPresContext,
nsReflowStatus status; nsReflowStatus status;
ReflowFixedFrame(aPresContext, reflowState, newFrames, PR_TRUE, status); ReflowFixedFrame(aPresContext, reflowState, newFrames, PR_TRUE, status);
newFrames->GetNextSibling(newFrames); newFrames->GetNextSibling(&newFrames);
} }
} }

4
layout/html/document/src/nsFrameSetFrame.cpp
View File

@ -417,7 +417,7 @@ void nsHTMLFramesetFrame::GetSizeOfChild(nsIFrame* aChild,
// this assumption is used here // this assumption is used here
int i = 0; int i = 0;
for (nsIFrame* child = mFrames.FirstChild(); child; for (nsIFrame* child = mFrames.FirstChild(); child;
child->GetNextSibling(child)) { child->GetNextSibling(&child)) {
if (aChild == child) { if (aChild == child) {
nsPoint ignore; nsPoint ignore;
GetSizeOfChildAt(i, aSize, ignore); GetSizeOfChildAt(i, aSize, ignore);
@ -1150,7 +1150,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext,
lastCol = cellIndex.x; lastCol = cellIndex.x;
lastSize = size; lastSize = size;
offset.x += size.width; offset.x += size.width;
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
if (firstTime) { if (firstTime) {

4
layout/html/forms/src/nsFieldSetFrame.cpp
View File

@ -148,7 +148,7 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext& aPresContext,
nsresult result = frame->QueryInterface(kLegendFrameCID, (void**)&legendFrame); nsresult result = frame->QueryInterface(kLegendFrameCID, (void**)&legendFrame);
if ((NS_OK == result) && legendFrame) { if ((NS_OK == result) && legendFrame) {
nsIFrame* nextFrame; nsIFrame* nextFrame;
frame->GetNextSibling(nextFrame); frame->GetNextSibling(&nextFrame);
if (lastFrame) { if (lastFrame) {
lastFrame->SetNextSibling(nextFrame); lastFrame->SetNextSibling(nextFrame);
} else { } else {
@ -161,7 +161,7 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext& aPresContext,
frame = nextFrame; frame = nextFrame;
} else { } else {
frame->SetParent(mFrames.FirstChild()); frame->SetParent(mFrames.FirstChild());
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
lastFrame = frame; lastFrame = frame;
} }

2
layout/html/forms/src/nsFileControlFrame.cpp
View File

@ -239,7 +239,7 @@ NS_IMETHODIMP nsFileControlFrame::Reflow(nsIPresContext& aPresContext,
maxSize.width -= desiredSize.width; maxSize.width -= desiredSize.width;
aDesiredSize.width += desiredSize.width; aDesiredSize.width += desiredSize.width;
aDesiredSize.height = desiredSize.height; aDesiredSize.height = desiredSize.height;
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
offset.x += desiredSize.width + CONTROL_SPACING; offset.x += desiredSize.width + CONTROL_SPACING;
} }
} }

2
layout/html/forms/src/nsHTMLButtonControlFrame.cpp
View File

@ -553,7 +553,7 @@ nsHTMLButtonControlFrame::SetInitialChildList(nsIPresContext& aPresContext,
NS_RELEASE(styleContext); NS_RELEASE(styleContext);
// Set the parent for each of the child frames // Set the parent for each of the child frames
for (nsIFrame* frame = aChildList; nsnull != frame; frame->GetNextSibling(frame)) { for (nsIFrame* frame = aChildList; nsnull != frame; frame->GetNextSibling(&frame)) {
frame->SetParent(mFrames.FirstChild()); frame->SetParent(mFrames.FirstChild());
} }

4
layout/html/forms/src/nsLabelFrame.cpp
View File

@ -339,7 +339,7 @@ nsLabelFrame::FindFirstControl(nsIFrame* aParentFrame, nsIFormControlFrame*& aRe
} else if (FindFirstControl(child, aResultFrame)) { } else if (FindFirstControl(child, aResultFrame)) {
return PR_TRUE; return PR_TRUE;
} }
child->GetNextSibling(child); child->GetNextSibling(&child);
} }
return PR_FALSE; return PR_FALSE;
} }
@ -367,7 +367,7 @@ nsLabelFrame::SetInitialChildList(nsIPresContext& aPresContext,
NS_RELEASE(styleContext); NS_RELEASE(styleContext);
// Set the geometric and content parent for each of the child frames // Set the geometric and content parent for each of the child frames
for (nsIFrame* frame = aChildList; nsnull != frame; frame->GetNextSibling(frame)) { for (nsIFrame* frame = aChildList; nsnull != frame; frame->GetNextSibling(&frame)) {
frame->SetParent(mFrames.FirstChild()); frame->SetParent(mFrames.FirstChild());
} }

2
layout/html/forms/src/nsLegendFrame.cpp
View File

@ -101,7 +101,7 @@ nsLegendFrame::SetInitialChildList(nsIPresContext& aPresContext,
NS_RELEASE(styleContext); NS_RELEASE(styleContext);
// Set the parent for each of the child frames // Set the parent for each of the child frames
for (nsIFrame* frame = aChildList; nsnull != frame; frame->GetNextSibling(frame)) { for (nsIFrame* frame = aChildList; nsnull != frame; frame->GetNextSibling(&frame)) {
frame->SetParent(mFrames.FirstChild()); frame->SetParent(mFrames.FirstChild());
} }

18
layout/html/forms/src/nsListControlFrame.cpp
View File

@ -208,7 +208,7 @@ nsListControlFrame::GetFrameForPointUsing(const nsPoint& aPoint,
//*aFrame = kid; //*aFrame = kid;
//return NS_OK; //return NS_OK;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
mContentFrame->FirstChild(aList, &kid); mContentFrame->FirstChild(aList, &kid);
@ -222,7 +222,7 @@ nsListControlFrame::GetFrameForPointUsing(const nsPoint& aPoint,
return NS_OK; return NS_OK;
} }
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
*aFrame = this; *aFrame = this;
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -326,7 +326,7 @@ nsListControlFrame::Reflow(nsIPresContext& aPresContext,
//??nsRect rect(offset.x, offset.y, desiredLineSize.width+lineEndPadding, desiredLineSize.height); //??nsRect rect(offset.x, offset.y, desiredLineSize.width+lineEndPadding, desiredLineSize.height);
nsRect rect(offset.x, offset.y, insideWidth, desiredLineSize.height); nsRect rect(offset.x, offset.y, insideWidth, desiredLineSize.height);
childFrame->SetRect(rect); childFrame->SetRect(rect);
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
offset.x = 0; offset.x = 0;
offset.y += desiredLineSize.height; offset.y += desiredLineSize.height;
} }
@ -378,7 +378,7 @@ nsListControlFrame::GetOptionFromChild(nsIFrame* aParentFrame)
if (nsnull != frame) { if (nsnull != frame) {
return frame; return frame;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
return nsnull; return nsnull;
} }
@ -438,7 +438,7 @@ PRInt32 nsListControlFrame::SetContentSelected(nsIFrame * aHitFrame,
aHitContent->SetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::kClass, (aIsSelected?kSelectedFocus:kNormal), PR_TRUE); aHitContent->SetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::kClass, (aIsSelected?kSelectedFocus:kNormal), PR_TRUE);
return index; return index;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
index++; index++;
} }
return -1; return -1;
@ -460,7 +460,7 @@ void nsListControlFrame::ClearSelection()
} }
} }
NS_RELEASE(content); NS_RELEASE(content);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
i++; i++;
} }
} }
@ -503,7 +503,7 @@ void nsListControlFrame::ExtendedSelection(PRInt32 aStartIndex, PRInt32 aEndInde
startInverting = PR_FALSE; startInverting = PR_FALSE;
} }
NS_RELEASE(content); NS_RELEASE(content);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
i++; i++;
} }
} }
@ -1046,7 +1046,7 @@ nsListControlFrame::AboutToDropDown()
return NS_OK; return NS_OK;
} }
NS_RELEASE(content); NS_RELEASE(content);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
i++; i++;
} }
return NS_OK; return NS_OK;
@ -1096,7 +1096,7 @@ nsListControlFrame::InitializeFromContent(PRBool aDoDisplay)
NS_RELEASE(option); NS_RELEASE(option);
} }
NS_RELEASE(content); NS_RELEASE(content);
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
i++; i++;
} }

26
layout/html/table/src/nsTableColGroupFrame.cpp
View File

@ -53,7 +53,7 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
if ((NS_SUCCEEDED(rv)) && (nsnull!=tableFrame)) if ((NS_SUCCEEDED(rv)) && (nsnull!=tableFrame))
{ {
// Process the newly added column frames // Process the newly added column frames
for (nsIFrame* kidFrame = aChildList; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) { for (nsIFrame* kidFrame = aChildList; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
// Set the preliminary values for the column frame // Set the preliminary values for the column frame
PRInt32 colIndex = mStartColIndex + mColCount; PRInt32 colIndex = mStartColIndex + mColCount;
((nsTableColFrame *)(kidFrame))->InitColFrame (colIndex); ((nsTableColFrame *)(kidFrame))->InitColFrame (colIndex);
@ -173,7 +173,7 @@ NS_METHOD nsTableColGroupFrame::Reflow(nsIPresContext& aPresContext,
} }
for (kidFrame = mFrames.FirstChild(); nsnull != kidFrame; for (kidFrame = mFrames.FirstChild(); nsnull != kidFrame;
kidFrame->GetNextSibling(kidFrame)) { kidFrame->GetNextSibling(&kidFrame)) {
// Give the child frame a chance to reflow, even though we know it'll have 0 size // Give the child frame a chance to reflow, even though we know it'll have 0 size
nsHTMLReflowMetrics kidSize(nsnull); nsHTMLReflowMetrics kidSize(nsnull);
// XXX Use a valid reason... // XXX Use a valid reason...
@ -328,7 +328,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColInserted(nsIPresContext& aPresCon
startingColIndex += GetColumnCount(); // has the side effect of resetting all column indexes startingColIndex += GetColumnCount(); // has the side effect of resetting all column indexes
nsIFrame *childFrame=nsnull; nsIFrame *childFrame=nsnull;
GetNextSibling(childFrame); GetNextSibling(&childFrame);
while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame)) while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame))
{ {
const nsStyleDisplay *display; const nsStyleDisplay *display;
@ -337,7 +337,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColInserted(nsIPresContext& aPresCon
{ {
startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex); startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
} }
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
nsTableFrame* tableFrame=nsnull; nsTableFrame* tableFrame=nsnull;
@ -365,7 +365,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColAppended(nsIPresContext& aPresCon
startingColIndex += GetColumnCount(); // has the side effect of resetting all column indexes startingColIndex += GetColumnCount(); // has the side effect of resetting all column indexes
nsIFrame *childFrame=nsnull; nsIFrame *childFrame=nsnull;
GetNextSibling(childFrame); GetNextSibling(&childFrame);
while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame)) while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame))
{ {
const nsStyleDisplay *display; const nsStyleDisplay *display;
@ -374,7 +374,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColAppended(nsIPresContext& aPresCon
{ {
startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex); startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
} }
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
// today we need to rebuild the whole column cache // today we need to rebuild the whole column cache
@ -405,7 +405,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColRemoved(nsIPresContext& aPresCont
if (childFrame==aDeletedFrame) if (childFrame==aDeletedFrame)
{ {
nsIFrame *deleteFrameNextSib=nsnull; nsIFrame *deleteFrameNextSib=nsnull;
aDeletedFrame->GetNextSibling(deleteFrameNextSib); aDeletedFrame->GetNextSibling(&deleteFrameNextSib);
if (nsnull!=prevSib) if (nsnull!=prevSib)
prevSib->SetNextSibling(deleteFrameNextSib); prevSib->SetNextSibling(deleteFrameNextSib);
else else
@ -420,7 +420,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColRemoved(nsIPresContext& aPresCont
startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex); startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
} }
prevSib=childFrame; prevSib=childFrame;
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
// today we need to rebuild the whole column cache // today we need to rebuild the whole column cache
@ -536,7 +536,7 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext& aPre
colStyleContext->RecalcAutomaticData(&aPresContext); colStyleContext->RecalcAutomaticData(&aPresContext);
colIndex++; colIndex++;
} }
colFrame->GetNextSibling(colFrame); colFrame->GetNextSibling(&colFrame);
} }
} }
else else
@ -566,7 +566,7 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext& aPre
colStyleContext->RecalcAutomaticData(&aPresContext); colStyleContext->RecalcAutomaticData(&aPresContext);
} }
} }
colFrame->GetNextSibling(colFrame); colFrame->GetNextSibling(&colFrame);
} }
} }
} }
@ -594,7 +594,7 @@ int nsTableColGroupFrame::GetColumnCount ()
col->SetColumnIndex (mStartColIndex + mColCount); col->SetColumnIndex (mStartColIndex + mColCount);
mColCount += col->GetSpan(); mColCount += col->GetSpan();
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
if (0==mColCount) if (0==mColCount)
{ // there were no children of this colgroup that were columns. So use my span attribute { // there were no children of this colgroup that were columns. So use my span attribute
@ -625,7 +625,7 @@ nsTableColFrame * nsTableColGroupFrame::GetNextColumn(nsIFrame *aChildFrame)
result = (nsTableColFrame *)childFrame; result = (nsTableColFrame *)childFrame;
break; break;
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
return result; return result;
} }
@ -647,7 +647,7 @@ nsTableColFrame * nsTableColGroupFrame::GetColumnAt (PRInt32 aColIndex)
if (aColIndex<=count) if (aColIndex<=count)
result = col; result = col;
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
return result; return result;
} }

68
layout/html/table/src/nsTableFrame.cpp
View File

@ -362,7 +362,7 @@ nsTableFrame::SetInitialChildList(nsIPresContext& aPresContext,
prevMainChild = childFrame; prevMainChild = childFrame;
} }
nsIFrame *prevChild = childFrame; nsIFrame *prevChild = childFrame;
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
prevChild->SetNextSibling(nsnull); prevChild->SetNextSibling(nsnull);
} }
if (nsnull!=prevMainChild) if (nsnull!=prevMainChild)
@ -381,7 +381,7 @@ NS_IMETHODIMP nsTableFrame::DidAppendRowGroup(nsTableRowGroupFrame *aRowGroupFra
nsresult rv=NS_OK; nsresult rv=NS_OK;
nsIFrame *nextRow=nsnull; nsIFrame *nextRow=nsnull;
aRowGroupFrame->FirstChild(nsnull, &nextRow); aRowGroupFrame->FirstChild(nsnull, &nextRow);
for ( ; nsnull!=nextRow; nextRow->GetNextSibling(nextRow)) for ( ; nsnull!=nextRow; nextRow->GetNextSibling(&nextRow))
{ {
const nsStyleDisplay *rowDisplay; const nsStyleDisplay *rowDisplay;
nextRow->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay); nextRow->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
@ -406,7 +406,7 @@ PRInt32 nsTableFrame::GetSpecifiedColumnCount ()
while (nsnull!=childFrame) while (nsnull!=childFrame)
{ {
mColCount += ((nsTableColGroupFrame *)childFrame)->GetColumnCount(); mColCount += ((nsTableColGroupFrame *)childFrame)->GetColumnCount();
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
if (PR_TRUE==gsDebug) printf("TIF GetSpecifiedColumnCount: returning %d\n", mColCount); if (PR_TRUE==gsDebug) printf("TIF GetSpecifiedColumnCount: returning %d\n", mColCount);
return mColCount; return mColCount;
@ -677,7 +677,7 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
break; break;
} }
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
// count the number of column frames we already have // count the number of column frames we already have
@ -691,7 +691,7 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
actualColumns += numCols; actualColumns += numCols;
lastColGroupFrame = (nsTableColGroupFrame *)childFrame; lastColGroupFrame = (nsTableColGroupFrame *)childFrame;
if (PR_TRUE==gsDebug) printf("EC: found a col group %p\n", lastColGroupFrame); if (PR_TRUE==gsDebug) printf("EC: found a col group %p\n", lastColGroupFrame);
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
// if we have fewer column frames than we need, create some implicit column frames // if we have fewer column frames than we need, create some implicit column frames
@ -915,7 +915,7 @@ NS_METHOD nsTableFrame::ReBuildCellMap()
if (PR_TRUE==gsDebugIR) printf("TIF: ReBuildCellMap.\n"); if (PR_TRUE==gsDebugIR) printf("TIF: ReBuildCellMap.\n");
nsresult rv=NS_OK; nsresult rv=NS_OK;
nsIFrame *rowGroupFrame=mFrames.FirstChild(); nsIFrame *rowGroupFrame=mFrames.FirstChild();
for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(rowGroupFrame)) for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(&rowGroupFrame))
{ {
const nsStyleDisplay *rowGroupDisplay; const nsStyleDisplay *rowGroupDisplay;
rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay); rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay);
@ -923,7 +923,7 @@ NS_METHOD nsTableFrame::ReBuildCellMap()
{ {
nsIFrame *rowFrame; nsIFrame *rowFrame;
rowGroupFrame->FirstChild(nsnull, &rowFrame); rowGroupFrame->FirstChild(nsnull, &rowFrame);
for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(rowFrame)) for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(&rowFrame))
{ {
const nsStyleDisplay *rowDisplay; const nsStyleDisplay *rowDisplay;
rowFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay); rowFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
@ -2280,7 +2280,7 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext& aPresCon
// Move the frames that follow aKidFrame by aDeltaY // Move the frames that follow aKidFrame by aDeltaY
nsIFrame* kidFrame; nsIFrame* kidFrame;
aKidFrame->GetNextSibling(kidFrame); aKidFrame->GetNextSibling(&kidFrame);
while (nsnull != kidFrame) { while (nsnull != kidFrame) {
nsPoint origin; nsPoint origin;
nsIHTMLReflow* htmlReflow; nsIHTMLReflow* htmlReflow;
@ -2297,7 +2297,7 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext& aPresCon
// Get the next frame // Get the next frame
lastKidFrame = kidFrame; lastKidFrame = kidFrame;
kidFrame->GetNextSibling(kidFrame); kidFrame->GetNextSibling(&kidFrame);
} }
} else { } else {
@ -2498,7 +2498,7 @@ NS_METHOD nsTableFrame::ResizeReflowPass1(nsIPresContext& aPresContext,
nsIFrame* kidFrame = aStartingFrame; nsIFrame* kidFrame = aStartingFrame;
if (nsnull==kidFrame) if (nsnull==kidFrame)
kidFrame=mFrames.FirstChild(); kidFrame=mFrames.FirstChild();
for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame))
{ {
const nsStyleDisplay *childDisplay; const nsStyleDisplay *childDisplay;
kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay)); kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay));
@ -2553,7 +2553,7 @@ NS_METHOD nsTableFrame::ResizeReflowPass1(nsIPresContext& aPresContext,
if (PR_TRUE==aDoSiblingFrames) if (PR_TRUE==aDoSiblingFrames)
{ {
kidFrame=mColGroups.FirstChild(); kidFrame=mColGroups.FirstChild();
for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame))
{ {
nsSize maxKidElementSize(0,0); nsSize maxKidElementSize(0,0);
nsHTMLReflowState kidReflowState(aPresContext, kidFrame, aReflowState, nsHTMLReflowState kidReflowState(aPresContext, kidFrame, aReflowState,
@ -2818,7 +2818,7 @@ NS_METHOD nsTableFrame::IR_ColGroupInserted(nsIPresContext& aPresContext,
if ((nsnull!=frameToInsertAfter) && (childFrame==frameToInsertAfter)) if ((nsnull!=frameToInsertAfter) && (childFrame==frameToInsertAfter))
{ {
nsIFrame *nextSib=nsnull; nsIFrame *nextSib=nsnull;
frameToInsertAfter->GetNextSibling(nextSib); frameToInsertAfter->GetNextSibling(&nextSib);
aInsertedFrame->SetNextSibling(nextSib); aInsertedFrame->SetNextSibling(nextSib);
frameToInsertAfter->SetNextSibling(aInsertedFrame); frameToInsertAfter->SetNextSibling(aInsertedFrame);
// account for childFrame being a COLGROUP now // account for childFrame being a COLGROUP now
@ -2834,7 +2834,7 @@ NS_METHOD nsTableFrame::IR_ColGroupInserted(nsIPresContext& aPresContext,
else // we've removed aDeletedFrame, now adjust the starting col index of all subsequent col groups else // we've removed aDeletedFrame, now adjust the starting col index of all subsequent col groups
startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex); startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
prevSib=childFrame; prevSib=childFrame;
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
InvalidateColumnCache(); InvalidateColumnCache();
@ -2860,7 +2860,7 @@ NS_METHOD nsTableFrame::IR_ColGroupAppended(nsIPresContext& aPresContext,
{ {
startingColIndex += ((nsTableColGroupFrame *)childFrame)->GetColumnCount(); startingColIndex += ((nsTableColGroupFrame *)childFrame)->GetColumnCount();
lastChild=childFrame; lastChild=childFrame;
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
// append aAppendedFrame // append aAppendedFrame
@ -2941,7 +2941,7 @@ NS_METHOD nsTableFrame::IR_ColGroupRemoved(nsIPresContext& aPresContext,
if (childFrame==aDeletedFrame) if (childFrame==aDeletedFrame)
{ {
nsIFrame *deleteFrameNextSib=nsnull; nsIFrame *deleteFrameNextSib=nsnull;
aDeletedFrame->GetNextSibling(deleteFrameNextSib); aDeletedFrame->GetNextSibling(&deleteFrameNextSib);
if (nsnull!=prevSib) if (nsnull!=prevSib)
prevSib->SetNextSibling(deleteFrameNextSib); prevSib->SetNextSibling(deleteFrameNextSib);
else else
@ -2961,7 +2961,7 @@ NS_METHOD nsTableFrame::IR_ColGroupRemoved(nsIPresContext& aPresContext,
startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex); startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
} }
prevSib=childFrame; prevSib=childFrame;
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
InvalidateColumnCache(); InvalidateColumnCache();
@ -3326,7 +3326,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
// Add the continuing frame to the sibling list // Add the continuing frame to the sibling list
nsIFrame* nextSib; nsIFrame* nextSib;
kidFrame->GetNextSibling(nextSib); kidFrame->GetNextSibling(&nextSib);
continuingFrame->SetNextSibling(nextSib); continuingFrame->SetNextSibling(nextSib);
kidFrame->SetNextSibling(continuingFrame); kidFrame->SetNextSibling(continuingFrame);
} }
@ -3334,7 +3334,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
// children to the next-in-flow // children to the next-in-flow
nsIFrame* nextSibling; nsIFrame* nextSibling;
kidFrame->GetNextSibling(nextSibling); kidFrame->GetNextSibling(&nextSibling);
if (nsnull != nextSibling) { if (nsnull != nextSibling) {
PushChildren(nextSibling, kidFrame); PushChildren(nextSibling, kidFrame);
} }
@ -3352,7 +3352,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
} }
// Get the next child // Get the next child
kidFrame->GetNextSibling(kidFrame); kidFrame->GetNextSibling(&kidFrame);
// XXX talk with troy about checking for available space here // XXX talk with troy about checking for available space here
} }
@ -3716,10 +3716,10 @@ nscoord nsTableFrame::ComputeDesiredHeight(nsIPresContext& aPresContext,
rowFrame->GetRect(rowRect); rowFrame->GetRect(rowRect);
sumOfRowHeights += rowRect.height; sumOfRowHeights += rowRect.height;
} }
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
} }
rowGroupFrame->GetNextSibling(rowGroupFrame); rowGroupFrame->GetNextSibling(&rowGroupFrame);
} }
rowGroupFrame=mFrames.FirstChild(); rowGroupFrame=mFrames.FirstChild();
nscoord y=0; nscoord y=0;
@ -3760,14 +3760,14 @@ nscoord nsTableFrame::ComputeDesiredHeight(nsIPresContext& aPresContext,
y += excessForRow+rowRect.height; y += excessForRow+rowRect.height;
excessForRowGroup += excessForRow; excessForRowGroup += excessForRow;
} }
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
nsRect rowGroupRect; nsRect rowGroupRect;
rowGroupFrame->GetRect(rowGroupRect); rowGroupFrame->GetRect(rowGroupRect);
nsRect newRowGroupRect(rowGroupRect.x, rowGroupRect.y, rowGroupRect.width, excessForRowGroup+rowGroupRect.height); nsRect newRowGroupRect(rowGroupRect.x, rowGroupRect.y, rowGroupRect.width, excessForRowGroup+rowGroupRect.height);
rowGroupFrame->SetRect(newRowGroupRect); rowGroupFrame->SetRect(newRowGroupRect);
} }
rowGroupFrame->GetNextSibling(rowGroupFrame); rowGroupFrame->GetNextSibling(&rowGroupFrame);
} }
} }
} }
@ -3942,7 +3942,7 @@ NS_METHOD nsTableFrame::GetColumnFrame(PRInt32 aColIndex, nsTableColFrame *&aCol
break; break;
} }
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
} }
NS_POSTCONDITION(nsnull!=aColFrame, "no column frame could be found."); NS_POSTCONDITION(nsnull!=aColFrame, "no column frame could be found.");
@ -4013,14 +4013,14 @@ void nsTableFrame::BuildColumnCache( nsIPresContext& aPresContext,
cellFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)cellDisplay)); cellFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)cellDisplay));
if (NS_STYLE_DISPLAY_TABLE_CELL == cellDisplay->mDisplay) if (NS_STYLE_DISPLAY_TABLE_CELL == cellDisplay->mDisplay)
SetColumnStyleFromCell(aPresContext, (nsTableCellFrame *)cellFrame, (nsTableRowFrame *)rowFrame); SetColumnStyleFromCell(aPresContext, (nsTableCellFrame *)cellFrame, (nsTableRowFrame *)rowFrame);
cellFrame->GetNextSibling(cellFrame); cellFrame->GetNextSibling(&cellFrame);
} }
} }
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
} }
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
// second time through, set column cache info for each column // second time through, set column cache info for each column
@ -4046,9 +4046,9 @@ void nsTableFrame::BuildColumnCache( nsIPresContext& aPresContext,
mColCache->AddColumnInfo(colPosition->mWidth.GetUnit(), colIndex+i); mColCache->AddColumnInfo(colPosition->mWidth.GetUnit(), colIndex+i);
} }
} }
colFrame->GetNextSibling((nsIFrame *&)colFrame); colFrame->GetNextSibling((nsIFrame **)&colFrame);
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
if (PR_TRUE==gsDebugIR) printf("TIF BCC: mColumnCacheValid=PR_TRUE.\n"); if (PR_TRUE==gsDebugIR) printf("TIF BCC: mColumnCacheValid=PR_TRUE.\n");
mColumnCacheValid=PR_TRUE; mColumnCacheValid=PR_TRUE;
@ -4076,9 +4076,9 @@ void nsTableFrame::CacheColFramesInCellMap()
} }
colIndex++; colIndex++;
} }
colFrame->GetNextSibling((nsIFrame *&)colFrame); colFrame->GetNextSibling((nsIFrame **)&colFrame);
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
} }
@ -4141,7 +4141,7 @@ void nsTableFrame::InvalidateCellMap()
firstInFlow->mCellMapValid=PR_FALSE; firstInFlow->mCellMapValid=PR_FALSE;
// reset the state in each row // reset the state in each row
nsIFrame *rowGroupFrame=mFrames.FirstChild(); nsIFrame *rowGroupFrame=mFrames.FirstChild();
for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(rowGroupFrame)) for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(&rowGroupFrame))
{ {
const nsStyleDisplay *rowGroupDisplay; const nsStyleDisplay *rowGroupDisplay;
rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay); rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay);
@ -4149,7 +4149,7 @@ void nsTableFrame::InvalidateCellMap()
{ {
nsIFrame *rowFrame; nsIFrame *rowFrame;
rowGroupFrame->FirstChild(nsnull, &rowFrame); rowGroupFrame->FirstChild(nsnull, &rowFrame);
for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(rowFrame)) for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(&rowFrame))
{ {
const nsStyleDisplay *rowDisplay; const nsStyleDisplay *rowDisplay;
rowFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay); rowFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
@ -4221,7 +4221,7 @@ nsTableFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
} }
NS_RELEASE(content); // content: REFCNT-- NS_RELEASE(content); // content: REFCNT--
// get the next row group // get the next row group
rg->GetNextSibling(rg); rg->GetNextSibling(&rg);
} }
aContinuingFrame = cf; aContinuingFrame = cf;
return NS_OK; return NS_OK;

10
layout/html/table/src/nsTableOuterFrame.cpp
View File

@ -106,7 +106,7 @@ NS_IMETHODIMP nsTableOuterFrame::SetInitialChildList(nsIPresContext& aPresContex
//XXX this should go through the child list looking for a displaytype==caption //XXX this should go through the child list looking for a displaytype==caption
if (1 < mFrames.GetLength()) { if (1 < mFrames.GetLength()) {
nsIFrame *child; nsIFrame *child;
nsresult result = aChildList->GetNextSibling(child); nsresult result = aChildList->GetNextSibling(&child);
while ((NS_SUCCEEDED(result)) && (nsnull!=child)) while ((NS_SUCCEEDED(result)) && (nsnull!=child))
{ {
const nsStyleDisplay* childDisplay; const nsStyleDisplay* childDisplay;
@ -116,7 +116,7 @@ NS_IMETHODIMP nsTableOuterFrame::SetInitialChildList(nsIPresContext& aPresContex
mCaptionFrame = child; mCaptionFrame = child;
break; break;
} }
result = child->GetNextSibling(child); result = child->GetNextSibling(&child);
} }
} }
@ -1159,7 +1159,7 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI
// Take the next-in-flow out of the parent's child list // Take the next-in-flow out of the parent's child list
if (parent->mFrames.FirstChild() == nextInFlow) { if (parent->mFrames.FirstChild() == nextInFlow) {
nsIFrame* nextSibling; nsIFrame* nextSibling;
nextInFlow->GetNextSibling(nextSibling); nextInFlow->GetNextSibling(&nextSibling);
parent->mFrames.SetFrames(nextSibling); parent->mFrames.SetFrames(nextSibling);
} else { } else {
@ -1171,10 +1171,10 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI
// next-in-flow is the last next-in-flow for aChild AND the // next-in-flow is the last next-in-flow for aChild AND the
// next-in-flow is not the last child in parent) // next-in-flow is not the last child in parent)
NS_ASSERTION(parent->IsChild(aChild), "screwy flow"); NS_ASSERTION(parent->IsChild(aChild), "screwy flow");
aChild->GetNextSibling(nextSibling); aChild->GetNextSibling(&nextSibling);
NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling"); NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling");
nextInFlow->GetNextSibling(nextSibling); nextInFlow->GetNextSibling(&nextSibling);
aChild->SetNextSibling(nextSibling); aChild->SetNextSibling(nextSibling);
} }

22
layout/html/table/src/nsTableRowFrame.cpp
View File

@ -124,7 +124,7 @@ nsTableRowFrame::InitChildren(PRInt32 aRowIndex)
SetRowIndex(rowIndex); SetRowIndex(rowIndex);
if (gsDebug) printf("Row InitChildren: set row index to %d\n", rowIndex); if (gsDebug) printf("Row InitChildren: set row index to %d\n", rowIndex);
PRInt32 colIndex = 0; PRInt32 colIndex = 0;
for (nsIFrame* kidFrame = mFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) for (nsIFrame* kidFrame = mFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame))
{ {
const nsStyleDisplay *kidDisplay; const nsStyleDisplay *kidDisplay;
kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay)); kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
@ -233,7 +233,7 @@ nsTableRowFrame::DidResize(nsIPresContext& aPresContext,
} }
} }
// Get the next cell // Get the next cell
cellFrame->GetNextSibling(cellFrame); cellFrame->GetNextSibling(&cellFrame);
} }
// Let our base class do the usual work // Let our base class do the usual work
@ -329,7 +329,7 @@ void nsTableRowFrame::PaintChildren(nsIPresContext& aPresContext,
aRenderingContext.PopState(clipState); aRenderingContext.PopState(clipState);
} }
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
@ -361,7 +361,7 @@ PRInt32 nsTableRowFrame::GetMaxColumns() const
{ {
sum += ((nsTableCellFrame *)cell)->GetColSpan(); sum += ((nsTableCellFrame *)cell)->GetColSpan();
} }
cell->GetNextSibling(cell); cell->GetNextSibling(&cell);
} }
return sum; return sum;
} }
@ -385,7 +385,7 @@ void nsTableRowFrame::GetMinRowSpan(nsTableFrame *aTableFrame)
else if (minRowSpan>rowSpan) else if (minRowSpan>rowSpan)
minRowSpan = rowSpan; minRowSpan = rowSpan;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
mMinRowSpan = minRowSpan; mMinRowSpan = minRowSpan;
} }
@ -408,7 +408,7 @@ void nsTableRowFrame::FixMinCellHeight(nsTableFrame *aTableFrame)
mTallestCell = rect.height; mTallestCell = rect.height;
} }
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
@ -473,7 +473,7 @@ nsIFrame * nsTableRowFrame::GetNextChildForDirection(PRUint8 aDir, nsIFrame *aCu
NS_ASSERTION(nsnull!=aCurrentChild, "bad arg"); NS_ASSERTION(nsnull!=aCurrentChild, "bad arg");
nsIFrame *result=nsnull; nsIFrame *result=nsnull;
aCurrentChild->GetNextSibling(result); aCurrentChild->GetNextSibling(&result);
return result; return result;
} }
@ -747,7 +747,7 @@ nsTableRowFrame::InitialReflow(nsIPresContext& aPresContext,
else else
kidFrame = aStartFrame; kidFrame = aStartFrame;
for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame))
{ {
const nsStyleDisplay *kidDisplay; const nsStyleDisplay *kidDisplay;
kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay)); kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
@ -924,7 +924,7 @@ NS_METHOD nsTableRowFrame::RecoverState(nsIPresContext& aPresContext,
} }
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Update the running x-offset based on the frame's current x-origin // Update the running x-offset based on the frame's current x-origin
@ -1466,7 +1466,7 @@ nsTableRowFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* newChildList; nsIFrame* newChildList;
for (nsIFrame* kidFrame = mFrames.FirstChild(); for (nsIFrame* kidFrame = mFrames.FirstChild();
nsnull != kidFrame; nsnull != kidFrame;
kidFrame->GetNextSibling(kidFrame)) { kidFrame->GetNextSibling(&kidFrame)) {
const nsStyleDisplay *kidDisplay; const nsStyleDisplay *kidDisplay;
kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay)); kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
@ -1517,7 +1517,7 @@ PRBool nsTableRowFrame::Contains(const nsPoint& aPoint)
result = PR_TRUE; result = PR_TRUE;
break; break;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
return result; return result;

34
layout/html/table/src/nsTableRowGroupFrame.cpp
View File

@ -120,7 +120,7 @@ NS_METHOD nsTableRowGroupFrame::GetRowCount(PRInt32 &aCount)
childFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay)); childFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay));
if (NS_STYLE_DISPLAY_TABLE_ROW == childDisplay->mDisplay) if (NS_STYLE_DISPLAY_TABLE_ROW == childDisplay->mDisplay)
aCount++; aCount++;
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
return NS_OK; return NS_OK;
} }
@ -140,7 +140,7 @@ PRInt32 nsTableRowGroupFrame::GetStartRowIndex()
result = ((nsTableRowFrame *)childFrame)->GetRowIndex(); result = ((nsTableRowFrame *)childFrame)->GetRowIndex();
break; break;
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
return result; return result;
} }
@ -161,7 +161,7 @@ NS_METHOD nsTableRowGroupFrame::GetMaxColumns(PRInt32 &aMaxColumns) const
PRInt32 colCount = ((nsTableRowFrame *)childFrame)->GetMaxColumns(); PRInt32 colCount = ((nsTableRowFrame *)childFrame)->GetMaxColumns();
aMaxColumns = PR_MAX(aMaxColumns, colCount); aMaxColumns = PR_MAX(aMaxColumns, colCount);
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
return NS_OK; return NS_OK;
} }
@ -239,7 +239,7 @@ void nsTableRowGroupFrame::PaintChildren(nsIPresContext& aPresContext,
} }
aRenderingContext.PopState(clipState); aRenderingContext.PopState(clipState);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
@ -265,7 +265,7 @@ nsTableRowGroupFrame::GetFrameForPoint(const nsPoint& aPoint, nsIFrame** aFrame)
return kid->GetFrameForPoint(tmp, aFrame); return kid->GetFrameForPoint(tmp, aFrame);
} }
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
*aFrame = this; *aFrame = this;
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -484,7 +484,7 @@ NS_METHOD nsTableRowGroupFrame::ReflowMappedChildren(nsIPresContext& aPresC
break; break;
// Get the next child // Get the next child
kidFrame->GetNextSibling(kidFrame); kidFrame->GetNextSibling(&kidFrame);
} }
return rv; return rv;
@ -661,7 +661,7 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
rowIndex++; rowIndex++;
} }
// Get the next row // Get the next row
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
/* Step 2: Now account for cells that span rows. /* Step 2: Now account for cells that span rows.
@ -777,21 +777,21 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
i, rowFrameToBeResized, rowRect.y + delta, delta); i, rowFrameToBeResized, rowRect.y + delta, delta);
} }
// Get the next row frame // Get the next row frame
rowFrameToBeResized->GetNextSibling((nsIFrame*&)rowFrameToBeResized); rowFrameToBeResized->GetNextSibling((nsIFrame**)&rowFrameToBeResized);
} }
delete []excessForRow; delete []excessForRow;
} }
} }
} }
// Get the next row child (cell frame) // Get the next row child (cell frame)
cellFrame->GetNextSibling(cellFrame); cellFrame->GetNextSibling(&cellFrame);
} }
// Update the running row group height // Update the running row group height
rowGroupHeight += rowHeights[rowIndex]; rowGroupHeight += rowHeights[rowIndex];
rowIndex++; rowIndex++;
} }
// Get the next rowgroup child (row frame) // Get the next rowgroup child (row frame)
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
} }
@ -806,7 +806,7 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
((nsTableRowFrame *)rowFrame)->DidResize(aPresContext, aReflowState); ((nsTableRowFrame *)rowFrame)->DidResize(aPresContext, aReflowState);
} }
// Get the next row // Get the next row
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
// Adjust our desired size // Adjust our desired size
@ -828,7 +828,7 @@ nsresult nsTableRowGroupFrame::AdjustSiblingsAfterReflow(nsIPresContext& aP
// Move the frames that follow aKidFrame by aDeltaY // Move the frames that follow aKidFrame by aDeltaY
nsIFrame* kidFrame; nsIFrame* kidFrame;
aKidFrame->GetNextSibling(kidFrame); aKidFrame->GetNextSibling(&kidFrame);
while (nsnull != kidFrame) { while (nsnull != kidFrame) {
nsPoint origin; nsPoint origin;
@ -845,7 +845,7 @@ nsresult nsTableRowGroupFrame::AdjustSiblingsAfterReflow(nsIPresContext& aP
// Get the next frame // Get the next frame
lastKidFrame = kidFrame; lastKidFrame = kidFrame;
kidFrame->GetNextSibling(kidFrame); kidFrame->GetNextSibling(&kidFrame);
} }
} else { } else {
@ -874,7 +874,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
// Walk each of the row frames looking for the first row frame that // Walk each of the row frames looking for the first row frame that
// doesn't fit in the available space // doesn't fit in the available space
for (nsIFrame* kidFrame = mFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) { for (nsIFrame* kidFrame = mFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
nsRect bounds; nsRect bounds;
kidFrame->GetRect(bounds); kidFrame->GetRect(bounds);
@ -908,7 +908,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
// Add it to the child list // Add it to the child list
nsIFrame* nextSibling; nsIFrame* nextSibling;
kidFrame->GetNextSibling(nextSibling); kidFrame->GetNextSibling(&nextSibling);
continuingFrame->SetNextSibling(nextSibling); continuingFrame->SetNextSibling(nextSibling);
kidFrame->SetNextSibling(continuingFrame); kidFrame->SetNextSibling(continuingFrame);
@ -1219,7 +1219,7 @@ PRBool nsTableRowGroupFrame::NoRowsFollow()
{ {
PRBool result = PR_TRUE; PRBool result = PR_TRUE;
nsIFrame *nextSib=nsnull; nsIFrame *nextSib=nsnull;
GetNextSibling(nextSib); GetNextSibling(&nextSib);
while (nsnull!=nextSib) while (nsnull!=nextSib)
{ {
const nsStyleDisplay *sibDisplay; const nsStyleDisplay *sibDisplay;
@ -1241,7 +1241,7 @@ PRBool nsTableRowGroupFrame::NoRowsFollow()
} }
} }
} }
nextSib->GetNextSibling(nextSib); nextSib->GetNextSibling(&nextSib);
} }
if (PR_TRUE==gsDebugIR) printf("\nTRGF IR: NoRowsFollow returning %d\n", result); if (PR_TRUE==gsDebugIR) printf("\nTRGF IR: NoRowsFollow returning %d\n", result);
return result; return result;

26
layout/tables/nsTableColGroupFrame.cpp
View File

@ -53,7 +53,7 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
if ((NS_SUCCEEDED(rv)) && (nsnull!=tableFrame)) if ((NS_SUCCEEDED(rv)) && (nsnull!=tableFrame))
{ {
// Process the newly added column frames // Process the newly added column frames
for (nsIFrame* kidFrame = aChildList; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) { for (nsIFrame* kidFrame = aChildList; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
// Set the preliminary values for the column frame // Set the preliminary values for the column frame
PRInt32 colIndex = mStartColIndex + mColCount; PRInt32 colIndex = mStartColIndex + mColCount;
((nsTableColFrame *)(kidFrame))->InitColFrame (colIndex); ((nsTableColFrame *)(kidFrame))->InitColFrame (colIndex);
@ -173,7 +173,7 @@ NS_METHOD nsTableColGroupFrame::Reflow(nsIPresContext& aPresContext,
} }
for (kidFrame = mFrames.FirstChild(); nsnull != kidFrame; for (kidFrame = mFrames.FirstChild(); nsnull != kidFrame;
kidFrame->GetNextSibling(kidFrame)) { kidFrame->GetNextSibling(&kidFrame)) {
// Give the child frame a chance to reflow, even though we know it'll have 0 size // Give the child frame a chance to reflow, even though we know it'll have 0 size
nsHTMLReflowMetrics kidSize(nsnull); nsHTMLReflowMetrics kidSize(nsnull);
// XXX Use a valid reason... // XXX Use a valid reason...
@ -328,7 +328,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColInserted(nsIPresContext& aPresCon
startingColIndex += GetColumnCount(); // has the side effect of resetting all column indexes startingColIndex += GetColumnCount(); // has the side effect of resetting all column indexes
nsIFrame *childFrame=nsnull; nsIFrame *childFrame=nsnull;
GetNextSibling(childFrame); GetNextSibling(&childFrame);
while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame)) while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame))
{ {
const nsStyleDisplay *display; const nsStyleDisplay *display;
@ -337,7 +337,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColInserted(nsIPresContext& aPresCon
{ {
startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex); startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
} }
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
nsTableFrame* tableFrame=nsnull; nsTableFrame* tableFrame=nsnull;
@ -365,7 +365,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColAppended(nsIPresContext& aPresCon
startingColIndex += GetColumnCount(); // has the side effect of resetting all column indexes startingColIndex += GetColumnCount(); // has the side effect of resetting all column indexes
nsIFrame *childFrame=nsnull; nsIFrame *childFrame=nsnull;
GetNextSibling(childFrame); GetNextSibling(&childFrame);
while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame)) while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame))
{ {
const nsStyleDisplay *display; const nsStyleDisplay *display;
@ -374,7 +374,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColAppended(nsIPresContext& aPresCon
{ {
startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex); startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
} }
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
// today we need to rebuild the whole column cache // today we need to rebuild the whole column cache
@ -405,7 +405,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColRemoved(nsIPresContext& aPresCont
if (childFrame==aDeletedFrame) if (childFrame==aDeletedFrame)
{ {
nsIFrame *deleteFrameNextSib=nsnull; nsIFrame *deleteFrameNextSib=nsnull;
aDeletedFrame->GetNextSibling(deleteFrameNextSib); aDeletedFrame->GetNextSibling(&deleteFrameNextSib);
if (nsnull!=prevSib) if (nsnull!=prevSib)
prevSib->SetNextSibling(deleteFrameNextSib); prevSib->SetNextSibling(deleteFrameNextSib);
else else
@ -420,7 +420,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColRemoved(nsIPresContext& aPresCont
startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex); startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
} }
prevSib=childFrame; prevSib=childFrame;
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
// today we need to rebuild the whole column cache // today we need to rebuild the whole column cache
@ -536,7 +536,7 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext& aPre
colStyleContext->RecalcAutomaticData(&aPresContext); colStyleContext->RecalcAutomaticData(&aPresContext);
colIndex++; colIndex++;
} }
colFrame->GetNextSibling(colFrame); colFrame->GetNextSibling(&colFrame);
} }
} }
else else
@ -566,7 +566,7 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext& aPre
colStyleContext->RecalcAutomaticData(&aPresContext); colStyleContext->RecalcAutomaticData(&aPresContext);
} }
} }
colFrame->GetNextSibling(colFrame); colFrame->GetNextSibling(&colFrame);
} }
} }
} }
@ -594,7 +594,7 @@ int nsTableColGroupFrame::GetColumnCount ()
col->SetColumnIndex (mStartColIndex + mColCount); col->SetColumnIndex (mStartColIndex + mColCount);
mColCount += col->GetSpan(); mColCount += col->GetSpan();
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
if (0==mColCount) if (0==mColCount)
{ // there were no children of this colgroup that were columns. So use my span attribute { // there were no children of this colgroup that were columns. So use my span attribute
@ -625,7 +625,7 @@ nsTableColFrame * nsTableColGroupFrame::GetNextColumn(nsIFrame *aChildFrame)
result = (nsTableColFrame *)childFrame; result = (nsTableColFrame *)childFrame;
break; break;
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
return result; return result;
} }
@ -647,7 +647,7 @@ nsTableColFrame * nsTableColGroupFrame::GetColumnAt (PRInt32 aColIndex)
if (aColIndex<=count) if (aColIndex<=count)
result = col; result = col;
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
return result; return result;
} }

68
layout/tables/nsTableFrame.cpp
View File

@ -362,7 +362,7 @@ nsTableFrame::SetInitialChildList(nsIPresContext& aPresContext,
prevMainChild = childFrame; prevMainChild = childFrame;
} }
nsIFrame *prevChild = childFrame; nsIFrame *prevChild = childFrame;
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
prevChild->SetNextSibling(nsnull); prevChild->SetNextSibling(nsnull);
} }
if (nsnull!=prevMainChild) if (nsnull!=prevMainChild)
@ -381,7 +381,7 @@ NS_IMETHODIMP nsTableFrame::DidAppendRowGroup(nsTableRowGroupFrame *aRowGroupFra
nsresult rv=NS_OK; nsresult rv=NS_OK;
nsIFrame *nextRow=nsnull; nsIFrame *nextRow=nsnull;
aRowGroupFrame->FirstChild(nsnull, &nextRow); aRowGroupFrame->FirstChild(nsnull, &nextRow);
for ( ; nsnull!=nextRow; nextRow->GetNextSibling(nextRow)) for ( ; nsnull!=nextRow; nextRow->GetNextSibling(&nextRow))
{ {
const nsStyleDisplay *rowDisplay; const nsStyleDisplay *rowDisplay;
nextRow->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay); nextRow->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
@ -406,7 +406,7 @@ PRInt32 nsTableFrame::GetSpecifiedColumnCount ()
while (nsnull!=childFrame) while (nsnull!=childFrame)
{ {
mColCount += ((nsTableColGroupFrame *)childFrame)->GetColumnCount(); mColCount += ((nsTableColGroupFrame *)childFrame)->GetColumnCount();
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
if (PR_TRUE==gsDebug) printf("TIF GetSpecifiedColumnCount: returning %d\n", mColCount); if (PR_TRUE==gsDebug) printf("TIF GetSpecifiedColumnCount: returning %d\n", mColCount);
return mColCount; return mColCount;
@ -677,7 +677,7 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
break; break;
} }
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
// count the number of column frames we already have // count the number of column frames we already have
@ -691,7 +691,7 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
actualColumns += numCols; actualColumns += numCols;
lastColGroupFrame = (nsTableColGroupFrame *)childFrame; lastColGroupFrame = (nsTableColGroupFrame *)childFrame;
if (PR_TRUE==gsDebug) printf("EC: found a col group %p\n", lastColGroupFrame); if (PR_TRUE==gsDebug) printf("EC: found a col group %p\n", lastColGroupFrame);
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
// if we have fewer column frames than we need, create some implicit column frames // if we have fewer column frames than we need, create some implicit column frames
@ -915,7 +915,7 @@ NS_METHOD nsTableFrame::ReBuildCellMap()
if (PR_TRUE==gsDebugIR) printf("TIF: ReBuildCellMap.\n"); if (PR_TRUE==gsDebugIR) printf("TIF: ReBuildCellMap.\n");
nsresult rv=NS_OK; nsresult rv=NS_OK;
nsIFrame *rowGroupFrame=mFrames.FirstChild(); nsIFrame *rowGroupFrame=mFrames.FirstChild();
for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(rowGroupFrame)) for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(&rowGroupFrame))
{ {
const nsStyleDisplay *rowGroupDisplay; const nsStyleDisplay *rowGroupDisplay;
rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay); rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay);
@ -923,7 +923,7 @@ NS_METHOD nsTableFrame::ReBuildCellMap()
{ {
nsIFrame *rowFrame; nsIFrame *rowFrame;
rowGroupFrame->FirstChild(nsnull, &rowFrame); rowGroupFrame->FirstChild(nsnull, &rowFrame);
for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(rowFrame)) for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(&rowFrame))
{ {
const nsStyleDisplay *rowDisplay; const nsStyleDisplay *rowDisplay;
rowFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay); rowFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
@ -2280,7 +2280,7 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext& aPresCon
// Move the frames that follow aKidFrame by aDeltaY // Move the frames that follow aKidFrame by aDeltaY
nsIFrame* kidFrame; nsIFrame* kidFrame;
aKidFrame->GetNextSibling(kidFrame); aKidFrame->GetNextSibling(&kidFrame);
while (nsnull != kidFrame) { while (nsnull != kidFrame) {
nsPoint origin; nsPoint origin;
nsIHTMLReflow* htmlReflow; nsIHTMLReflow* htmlReflow;
@ -2297,7 +2297,7 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext& aPresCon
// Get the next frame // Get the next frame
lastKidFrame = kidFrame; lastKidFrame = kidFrame;
kidFrame->GetNextSibling(kidFrame); kidFrame->GetNextSibling(&kidFrame);
} }
} else { } else {
@ -2498,7 +2498,7 @@ NS_METHOD nsTableFrame::ResizeReflowPass1(nsIPresContext& aPresContext,
nsIFrame* kidFrame = aStartingFrame; nsIFrame* kidFrame = aStartingFrame;
if (nsnull==kidFrame) if (nsnull==kidFrame)
kidFrame=mFrames.FirstChild(); kidFrame=mFrames.FirstChild();
for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame))
{ {
const nsStyleDisplay *childDisplay; const nsStyleDisplay *childDisplay;
kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay)); kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay));
@ -2553,7 +2553,7 @@ NS_METHOD nsTableFrame::ResizeReflowPass1(nsIPresContext& aPresContext,
if (PR_TRUE==aDoSiblingFrames) if (PR_TRUE==aDoSiblingFrames)
{ {
kidFrame=mColGroups.FirstChild(); kidFrame=mColGroups.FirstChild();
for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame))
{ {
nsSize maxKidElementSize(0,0); nsSize maxKidElementSize(0,0);
nsHTMLReflowState kidReflowState(aPresContext, kidFrame, aReflowState, nsHTMLReflowState kidReflowState(aPresContext, kidFrame, aReflowState,
@ -2818,7 +2818,7 @@ NS_METHOD nsTableFrame::IR_ColGroupInserted(nsIPresContext& aPresContext,
if ((nsnull!=frameToInsertAfter) && (childFrame==frameToInsertAfter)) if ((nsnull!=frameToInsertAfter) && (childFrame==frameToInsertAfter))
{ {
nsIFrame *nextSib=nsnull; nsIFrame *nextSib=nsnull;
frameToInsertAfter->GetNextSibling(nextSib); frameToInsertAfter->GetNextSibling(&nextSib);
aInsertedFrame->SetNextSibling(nextSib); aInsertedFrame->SetNextSibling(nextSib);
frameToInsertAfter->SetNextSibling(aInsertedFrame); frameToInsertAfter->SetNextSibling(aInsertedFrame);
// account for childFrame being a COLGROUP now // account for childFrame being a COLGROUP now
@ -2834,7 +2834,7 @@ NS_METHOD nsTableFrame::IR_ColGroupInserted(nsIPresContext& aPresContext,
else // we've removed aDeletedFrame, now adjust the starting col index of all subsequent col groups else // we've removed aDeletedFrame, now adjust the starting col index of all subsequent col groups
startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex); startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
prevSib=childFrame; prevSib=childFrame;
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
InvalidateColumnCache(); InvalidateColumnCache();
@ -2860,7 +2860,7 @@ NS_METHOD nsTableFrame::IR_ColGroupAppended(nsIPresContext& aPresContext,
{ {
startingColIndex += ((nsTableColGroupFrame *)childFrame)->GetColumnCount(); startingColIndex += ((nsTableColGroupFrame *)childFrame)->GetColumnCount();
lastChild=childFrame; lastChild=childFrame;
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
// append aAppendedFrame // append aAppendedFrame
@ -2941,7 +2941,7 @@ NS_METHOD nsTableFrame::IR_ColGroupRemoved(nsIPresContext& aPresContext,
if (childFrame==aDeletedFrame) if (childFrame==aDeletedFrame)
{ {
nsIFrame *deleteFrameNextSib=nsnull; nsIFrame *deleteFrameNextSib=nsnull;
aDeletedFrame->GetNextSibling(deleteFrameNextSib); aDeletedFrame->GetNextSibling(&deleteFrameNextSib);
if (nsnull!=prevSib) if (nsnull!=prevSib)
prevSib->SetNextSibling(deleteFrameNextSib); prevSib->SetNextSibling(deleteFrameNextSib);
else else
@ -2961,7 +2961,7 @@ NS_METHOD nsTableFrame::IR_ColGroupRemoved(nsIPresContext& aPresContext,
startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex); startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
} }
prevSib=childFrame; prevSib=childFrame;
rv = childFrame->GetNextSibling(childFrame); rv = childFrame->GetNextSibling(&childFrame);
} }
InvalidateColumnCache(); InvalidateColumnCache();
@ -3326,7 +3326,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
// Add the continuing frame to the sibling list // Add the continuing frame to the sibling list
nsIFrame* nextSib; nsIFrame* nextSib;
kidFrame->GetNextSibling(nextSib); kidFrame->GetNextSibling(&nextSib);
continuingFrame->SetNextSibling(nextSib); continuingFrame->SetNextSibling(nextSib);
kidFrame->SetNextSibling(continuingFrame); kidFrame->SetNextSibling(continuingFrame);
} }
@ -3334,7 +3334,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
// children to the next-in-flow // children to the next-in-flow
nsIFrame* nextSibling; nsIFrame* nextSibling;
kidFrame->GetNextSibling(nextSibling); kidFrame->GetNextSibling(&nextSibling);
if (nsnull != nextSibling) { if (nsnull != nextSibling) {
PushChildren(nextSibling, kidFrame); PushChildren(nextSibling, kidFrame);
} }
@ -3352,7 +3352,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
} }
// Get the next child // Get the next child
kidFrame->GetNextSibling(kidFrame); kidFrame->GetNextSibling(&kidFrame);
// XXX talk with troy about checking for available space here // XXX talk with troy about checking for available space here
} }
@ -3716,10 +3716,10 @@ nscoord nsTableFrame::ComputeDesiredHeight(nsIPresContext& aPresContext,
rowFrame->GetRect(rowRect); rowFrame->GetRect(rowRect);
sumOfRowHeights += rowRect.height; sumOfRowHeights += rowRect.height;
} }
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
} }
rowGroupFrame->GetNextSibling(rowGroupFrame); rowGroupFrame->GetNextSibling(&rowGroupFrame);
} }
rowGroupFrame=mFrames.FirstChild(); rowGroupFrame=mFrames.FirstChild();
nscoord y=0; nscoord y=0;
@ -3760,14 +3760,14 @@ nscoord nsTableFrame::ComputeDesiredHeight(nsIPresContext& aPresContext,
y += excessForRow+rowRect.height; y += excessForRow+rowRect.height;
excessForRowGroup += excessForRow; excessForRowGroup += excessForRow;
} }
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
nsRect rowGroupRect; nsRect rowGroupRect;
rowGroupFrame->GetRect(rowGroupRect); rowGroupFrame->GetRect(rowGroupRect);
nsRect newRowGroupRect(rowGroupRect.x, rowGroupRect.y, rowGroupRect.width, excessForRowGroup+rowGroupRect.height); nsRect newRowGroupRect(rowGroupRect.x, rowGroupRect.y, rowGroupRect.width, excessForRowGroup+rowGroupRect.height);
rowGroupFrame->SetRect(newRowGroupRect); rowGroupFrame->SetRect(newRowGroupRect);
} }
rowGroupFrame->GetNextSibling(rowGroupFrame); rowGroupFrame->GetNextSibling(&rowGroupFrame);
} }
} }
} }
@ -3942,7 +3942,7 @@ NS_METHOD nsTableFrame::GetColumnFrame(PRInt32 aColIndex, nsTableColFrame *&aCol
break; break;
} }
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
} }
NS_POSTCONDITION(nsnull!=aColFrame, "no column frame could be found."); NS_POSTCONDITION(nsnull!=aColFrame, "no column frame could be found.");
@ -4013,14 +4013,14 @@ void nsTableFrame::BuildColumnCache( nsIPresContext& aPresContext,
cellFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)cellDisplay)); cellFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)cellDisplay));
if (NS_STYLE_DISPLAY_TABLE_CELL == cellDisplay->mDisplay) if (NS_STYLE_DISPLAY_TABLE_CELL == cellDisplay->mDisplay)
SetColumnStyleFromCell(aPresContext, (nsTableCellFrame *)cellFrame, (nsTableRowFrame *)rowFrame); SetColumnStyleFromCell(aPresContext, (nsTableCellFrame *)cellFrame, (nsTableRowFrame *)rowFrame);
cellFrame->GetNextSibling(cellFrame); cellFrame->GetNextSibling(&cellFrame);
} }
} }
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
} }
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
// second time through, set column cache info for each column // second time through, set column cache info for each column
@ -4046,9 +4046,9 @@ void nsTableFrame::BuildColumnCache( nsIPresContext& aPresContext,
mColCache->AddColumnInfo(colPosition->mWidth.GetUnit(), colIndex+i); mColCache->AddColumnInfo(colPosition->mWidth.GetUnit(), colIndex+i);
} }
} }
colFrame->GetNextSibling((nsIFrame *&)colFrame); colFrame->GetNextSibling((nsIFrame **)&colFrame);
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
if (PR_TRUE==gsDebugIR) printf("TIF BCC: mColumnCacheValid=PR_TRUE.\n"); if (PR_TRUE==gsDebugIR) printf("TIF BCC: mColumnCacheValid=PR_TRUE.\n");
mColumnCacheValid=PR_TRUE; mColumnCacheValid=PR_TRUE;
@ -4076,9 +4076,9 @@ void nsTableFrame::CacheColFramesInCellMap()
} }
colIndex++; colIndex++;
} }
colFrame->GetNextSibling((nsIFrame *&)colFrame); colFrame->GetNextSibling((nsIFrame **)&colFrame);
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
} }
@ -4141,7 +4141,7 @@ void nsTableFrame::InvalidateCellMap()
firstInFlow->mCellMapValid=PR_FALSE; firstInFlow->mCellMapValid=PR_FALSE;
// reset the state in each row // reset the state in each row
nsIFrame *rowGroupFrame=mFrames.FirstChild(); nsIFrame *rowGroupFrame=mFrames.FirstChild();
for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(rowGroupFrame)) for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(&rowGroupFrame))
{ {
const nsStyleDisplay *rowGroupDisplay; const nsStyleDisplay *rowGroupDisplay;
rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay); rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay);
@ -4149,7 +4149,7 @@ void nsTableFrame::InvalidateCellMap()
{ {
nsIFrame *rowFrame; nsIFrame *rowFrame;
rowGroupFrame->FirstChild(nsnull, &rowFrame); rowGroupFrame->FirstChild(nsnull, &rowFrame);
for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(rowFrame)) for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(&rowFrame))
{ {
const nsStyleDisplay *rowDisplay; const nsStyleDisplay *rowDisplay;
rowFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay); rowFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
@ -4221,7 +4221,7 @@ nsTableFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
} }
NS_RELEASE(content); // content: REFCNT-- NS_RELEASE(content); // content: REFCNT--
// get the next row group // get the next row group
rg->GetNextSibling(rg); rg->GetNextSibling(&rg);
} }
aContinuingFrame = cf; aContinuingFrame = cf;
return NS_OK; return NS_OK;

10
layout/tables/nsTableOuterFrame.cpp
View File

@ -106,7 +106,7 @@ NS_IMETHODIMP nsTableOuterFrame::SetInitialChildList(nsIPresContext& aPresContex
//XXX this should go through the child list looking for a displaytype==caption //XXX this should go through the child list looking for a displaytype==caption
if (1 < mFrames.GetLength()) { if (1 < mFrames.GetLength()) {
nsIFrame *child; nsIFrame *child;
nsresult result = aChildList->GetNextSibling(child); nsresult result = aChildList->GetNextSibling(&child);
while ((NS_SUCCEEDED(result)) && (nsnull!=child)) while ((NS_SUCCEEDED(result)) && (nsnull!=child))
{ {
const nsStyleDisplay* childDisplay; const nsStyleDisplay* childDisplay;
@ -116,7 +116,7 @@ NS_IMETHODIMP nsTableOuterFrame::SetInitialChildList(nsIPresContext& aPresContex
mCaptionFrame = child; mCaptionFrame = child;
break; break;
} }
result = child->GetNextSibling(child); result = child->GetNextSibling(&child);
} }
} }
@ -1159,7 +1159,7 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI
// Take the next-in-flow out of the parent's child list // Take the next-in-flow out of the parent's child list
if (parent->mFrames.FirstChild() == nextInFlow) { if (parent->mFrames.FirstChild() == nextInFlow) {
nsIFrame* nextSibling; nsIFrame* nextSibling;
nextInFlow->GetNextSibling(nextSibling); nextInFlow->GetNextSibling(&nextSibling);
parent->mFrames.SetFrames(nextSibling); parent->mFrames.SetFrames(nextSibling);
} else { } else {
@ -1171,10 +1171,10 @@ void nsTableOuterFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext, nsI
// next-in-flow is the last next-in-flow for aChild AND the // next-in-flow is the last next-in-flow for aChild AND the
// next-in-flow is not the last child in parent) // next-in-flow is not the last child in parent)
NS_ASSERTION(parent->IsChild(aChild), "screwy flow"); NS_ASSERTION(parent->IsChild(aChild), "screwy flow");
aChild->GetNextSibling(nextSibling); aChild->GetNextSibling(&nextSibling);
NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling"); NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling");
nextInFlow->GetNextSibling(nextSibling); nextInFlow->GetNextSibling(&nextSibling);
aChild->SetNextSibling(nextSibling); aChild->SetNextSibling(nextSibling);
} }

22
layout/tables/nsTableRowFrame.cpp
View File

@ -124,7 +124,7 @@ nsTableRowFrame::InitChildren(PRInt32 aRowIndex)
SetRowIndex(rowIndex); SetRowIndex(rowIndex);
if (gsDebug) printf("Row InitChildren: set row index to %d\n", rowIndex); if (gsDebug) printf("Row InitChildren: set row index to %d\n", rowIndex);
PRInt32 colIndex = 0; PRInt32 colIndex = 0;
for (nsIFrame* kidFrame = mFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) for (nsIFrame* kidFrame = mFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame))
{ {
const nsStyleDisplay *kidDisplay; const nsStyleDisplay *kidDisplay;
kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay)); kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
@ -233,7 +233,7 @@ nsTableRowFrame::DidResize(nsIPresContext& aPresContext,
} }
} }
// Get the next cell // Get the next cell
cellFrame->GetNextSibling(cellFrame); cellFrame->GetNextSibling(&cellFrame);
} }
// Let our base class do the usual work // Let our base class do the usual work
@ -329,7 +329,7 @@ void nsTableRowFrame::PaintChildren(nsIPresContext& aPresContext,
aRenderingContext.PopState(clipState); aRenderingContext.PopState(clipState);
} }
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
@ -361,7 +361,7 @@ PRInt32 nsTableRowFrame::GetMaxColumns() const
{ {
sum += ((nsTableCellFrame *)cell)->GetColSpan(); sum += ((nsTableCellFrame *)cell)->GetColSpan();
} }
cell->GetNextSibling(cell); cell->GetNextSibling(&cell);
} }
return sum; return sum;
} }
@ -385,7 +385,7 @@ void nsTableRowFrame::GetMinRowSpan(nsTableFrame *aTableFrame)
else if (minRowSpan>rowSpan) else if (minRowSpan>rowSpan)
minRowSpan = rowSpan; minRowSpan = rowSpan;
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
mMinRowSpan = minRowSpan; mMinRowSpan = minRowSpan;
} }
@ -408,7 +408,7 @@ void nsTableRowFrame::FixMinCellHeight(nsTableFrame *aTableFrame)
mTallestCell = rect.height; mTallestCell = rect.height;
} }
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
} }
@ -473,7 +473,7 @@ nsIFrame * nsTableRowFrame::GetNextChildForDirection(PRUint8 aDir, nsIFrame *aCu
NS_ASSERTION(nsnull!=aCurrentChild, "bad arg"); NS_ASSERTION(nsnull!=aCurrentChild, "bad arg");
nsIFrame *result=nsnull; nsIFrame *result=nsnull;
aCurrentChild->GetNextSibling(result); aCurrentChild->GetNextSibling(&result);
return result; return result;
} }
@ -747,7 +747,7 @@ nsTableRowFrame::InitialReflow(nsIPresContext& aPresContext,
else else
kidFrame = aStartFrame; kidFrame = aStartFrame;
for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame))
{ {
const nsStyleDisplay *kidDisplay; const nsStyleDisplay *kidDisplay;
kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay)); kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
@ -924,7 +924,7 @@ NS_METHOD nsTableRowFrame::RecoverState(nsIPresContext& aPresContext,
} }
} }
frame->GetNextSibling(frame); frame->GetNextSibling(&frame);
} }
// Update the running x-offset based on the frame's current x-origin // Update the running x-offset based on the frame's current x-origin
@ -1466,7 +1466,7 @@ nsTableRowFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* newChildList; nsIFrame* newChildList;
for (nsIFrame* kidFrame = mFrames.FirstChild(); for (nsIFrame* kidFrame = mFrames.FirstChild();
nsnull != kidFrame; nsnull != kidFrame;
kidFrame->GetNextSibling(kidFrame)) { kidFrame->GetNextSibling(&kidFrame)) {
const nsStyleDisplay *kidDisplay; const nsStyleDisplay *kidDisplay;
kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay)); kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
@ -1517,7 +1517,7 @@ PRBool nsTableRowFrame::Contains(const nsPoint& aPoint)
result = PR_TRUE; result = PR_TRUE;
break; break;
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
return result; return result;

34
layout/tables/nsTableRowGroupFrame.cpp
View File

@ -120,7 +120,7 @@ NS_METHOD nsTableRowGroupFrame::GetRowCount(PRInt32 &aCount)
childFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay)); childFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay));
if (NS_STYLE_DISPLAY_TABLE_ROW == childDisplay->mDisplay) if (NS_STYLE_DISPLAY_TABLE_ROW == childDisplay->mDisplay)
aCount++; aCount++;
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
return NS_OK; return NS_OK;
} }
@ -140,7 +140,7 @@ PRInt32 nsTableRowGroupFrame::GetStartRowIndex()
result = ((nsTableRowFrame *)childFrame)->GetRowIndex(); result = ((nsTableRowFrame *)childFrame)->GetRowIndex();
break; break;
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
return result; return result;
} }
@ -161,7 +161,7 @@ NS_METHOD nsTableRowGroupFrame::GetMaxColumns(PRInt32 &aMaxColumns) const
PRInt32 colCount = ((nsTableRowFrame *)childFrame)->GetMaxColumns(); PRInt32 colCount = ((nsTableRowFrame *)childFrame)->GetMaxColumns();
aMaxColumns = PR_MAX(aMaxColumns, colCount); aMaxColumns = PR_MAX(aMaxColumns, colCount);
} }
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
} }
return NS_OK; return NS_OK;
} }
@ -239,7 +239,7 @@ void nsTableRowGroupFrame::PaintChildren(nsIPresContext& aPresContext,
} }
aRenderingContext.PopState(clipState); aRenderingContext.PopState(clipState);
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
} }
@ -265,7 +265,7 @@ nsTableRowGroupFrame::GetFrameForPoint(const nsPoint& aPoint, nsIFrame** aFrame)
return kid->GetFrameForPoint(tmp, aFrame); return kid->GetFrameForPoint(tmp, aFrame);
} }
} }
kid->GetNextSibling(kid); kid->GetNextSibling(&kid);
} }
*aFrame = this; *aFrame = this;
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -484,7 +484,7 @@ NS_METHOD nsTableRowGroupFrame::ReflowMappedChildren(nsIPresContext& aPresC
break; break;
// Get the next child // Get the next child
kidFrame->GetNextSibling(kidFrame); kidFrame->GetNextSibling(&kidFrame);
} }
return rv; return rv;
@ -661,7 +661,7 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
rowIndex++; rowIndex++;
} }
// Get the next row // Get the next row
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
/* Step 2: Now account for cells that span rows. /* Step 2: Now account for cells that span rows.
@ -777,21 +777,21 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
i, rowFrameToBeResized, rowRect.y + delta, delta); i, rowFrameToBeResized, rowRect.y + delta, delta);
} }
// Get the next row frame // Get the next row frame
rowFrameToBeResized->GetNextSibling((nsIFrame*&)rowFrameToBeResized); rowFrameToBeResized->GetNextSibling((nsIFrame**)&rowFrameToBeResized);
} }
delete []excessForRow; delete []excessForRow;
} }
} }
} }
// Get the next row child (cell frame) // Get the next row child (cell frame)
cellFrame->GetNextSibling(cellFrame); cellFrame->GetNextSibling(&cellFrame);
} }
// Update the running row group height // Update the running row group height
rowGroupHeight += rowHeights[rowIndex]; rowGroupHeight += rowHeights[rowIndex];
rowIndex++; rowIndex++;
} }
// Get the next rowgroup child (row frame) // Get the next rowgroup child (row frame)
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
} }
@ -806,7 +806,7 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
((nsTableRowFrame *)rowFrame)->DidResize(aPresContext, aReflowState); ((nsTableRowFrame *)rowFrame)->DidResize(aPresContext, aReflowState);
} }
// Get the next row // Get the next row
rowFrame->GetNextSibling(rowFrame); rowFrame->GetNextSibling(&rowFrame);
} }
// Adjust our desired size // Adjust our desired size
@ -828,7 +828,7 @@ nsresult nsTableRowGroupFrame::AdjustSiblingsAfterReflow(nsIPresContext& aP
// Move the frames that follow aKidFrame by aDeltaY // Move the frames that follow aKidFrame by aDeltaY
nsIFrame* kidFrame; nsIFrame* kidFrame;
aKidFrame->GetNextSibling(kidFrame); aKidFrame->GetNextSibling(&kidFrame);
while (nsnull != kidFrame) { while (nsnull != kidFrame) {
nsPoint origin; nsPoint origin;
@ -845,7 +845,7 @@ nsresult nsTableRowGroupFrame::AdjustSiblingsAfterReflow(nsIPresContext& aP
// Get the next frame // Get the next frame
lastKidFrame = kidFrame; lastKidFrame = kidFrame;
kidFrame->GetNextSibling(kidFrame); kidFrame->GetNextSibling(&kidFrame);
} }
} else { } else {
@ -874,7 +874,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
// Walk each of the row frames looking for the first row frame that // Walk each of the row frames looking for the first row frame that
// doesn't fit in the available space // doesn't fit in the available space
for (nsIFrame* kidFrame = mFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) { for (nsIFrame* kidFrame = mFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
nsRect bounds; nsRect bounds;
kidFrame->GetRect(bounds); kidFrame->GetRect(bounds);
@ -908,7 +908,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext& aPresContext,
// Add it to the child list // Add it to the child list
nsIFrame* nextSibling; nsIFrame* nextSibling;
kidFrame->GetNextSibling(nextSibling); kidFrame->GetNextSibling(&nextSibling);
continuingFrame->SetNextSibling(nextSibling); continuingFrame->SetNextSibling(nextSibling);
kidFrame->SetNextSibling(continuingFrame); kidFrame->SetNextSibling(continuingFrame);
@ -1219,7 +1219,7 @@ PRBool nsTableRowGroupFrame::NoRowsFollow()
{ {
PRBool result = PR_TRUE; PRBool result = PR_TRUE;
nsIFrame *nextSib=nsnull; nsIFrame *nextSib=nsnull;
GetNextSibling(nextSib); GetNextSibling(&nextSib);
while (nsnull!=nextSib) while (nsnull!=nextSib)
{ {
const nsStyleDisplay *sibDisplay; const nsStyleDisplay *sibDisplay;
@ -1241,7 +1241,7 @@ PRBool nsTableRowGroupFrame::NoRowsFollow()
} }
} }
} }
nextSib->GetNextSibling(nextSib); nextSib->GetNextSibling(&nextSib);
} }
if (PR_TRUE==gsDebugIR) printf("\nTRGF IR: NoRowsFollow returning %d\n", result); if (PR_TRUE==gsDebugIR) printf("\nTRGF IR: NoRowsFollow returning %d\n", result);
return result; return result;

2
layout/xul/base/src/nsToolboxFrame.cpp
View File

@ -353,7 +353,7 @@ nsToolboxFrame :: Reflow(nsIPresContext& aPresContext,
// advance to the next child frame, if appropriate, and advance child content // advance to the next child frame, if appropriate, and advance child content
if ( canAdvanceFrame ) if ( canAdvanceFrame )
childFrame->GetNextSibling(childFrame); childFrame->GetNextSibling(&childFrame);
++contentCounter; ++contentCounter;
toolboxContent->ChildAt(contentCounter, *getter_AddRefs(childContent)); toolboxContent->ChildAt(contentCounter, *getter_AddRefs(childContent));
++grippyIndex; ++grippyIndex;