diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index 90e08330551..b2f6dad6cae 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -1408,7 +1408,7 @@ FindFrameWithContent(nsIFrame* aFrame, nsIContent* aContent)
         NS_IF_RELEASE(listName);
         return result;
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
     NS_IF_RELEASE(listName);
     aFrame->GetAdditionalChildListName(listIndex++, &listName);
@@ -1732,8 +1732,8 @@ CompareTrees(nsIFrame* aA, nsIFrame* aB)
         CompareTrees(k1, k2);
 
         // Advance to next sibling
-        k1->GetNextSibling(k1);
-        k2->GetNextSibling(k2);
+        k1->GetNextSibling(&k1);
+        k2->GetNextSibling(&k2);
       }
       else {
         break;
diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h
index 40c5f38fb85..535dc0c0ba1 100644
--- a/mozilla/layout/base/public/nsIFrame.h
+++ b/mozilla/layout/base/public/nsIFrame.h
@@ -339,7 +339,7 @@ public:
   /**
    * 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;
 
   /**
diff --git a/mozilla/layout/base/src/nsRangeList.cpp b/mozilla/layout/base/src/nsRangeList.cpp
index defdf791590..78a493fe2e3 100644
--- a/mozilla/layout/base/src/nsRangeList.cpp
+++ b/mozilla/layout/base/src/nsRangeList.cpp
@@ -596,7 +596,7 @@ getNextFrame(nsIFrame *aStart)
     return result;
   }
   while(parent){
-    if (NS_SUCCEEDED(parent->GetNextSibling(result)) && result){
+    if (NS_SUCCEEDED(parent->GetNextSibling(&result)) && result){
       parent = result;
       return result;
     }
@@ -867,7 +867,7 @@ findFrameFromContent(nsIFrame *aParent, nsIContent *aContent, PRBool aTurnOff)
     if (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;
 }
 
diff --git a/mozilla/layout/forms/nsFieldSetFrame.cpp b/mozilla/layout/forms/nsFieldSetFrame.cpp
index f1b69f4a342..9a6f52e5087 100644
--- a/mozilla/layout/forms/nsFieldSetFrame.cpp
+++ b/mozilla/layout/forms/nsFieldSetFrame.cpp
@@ -148,7 +148,7 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext& aPresContext,
     nsresult result = frame->QueryInterface(kLegendFrameCID, (void**)&legendFrame);
     if ((NS_OK == result) && legendFrame) {
       nsIFrame* nextFrame;
-      frame->GetNextSibling(nextFrame);
+      frame->GetNextSibling(&nextFrame);
       if (lastFrame) {
         lastFrame->SetNextSibling(nextFrame);
       } else {
@@ -161,7 +161,7 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext& aPresContext,
       frame = nextFrame;
      } else {
       frame->SetParent(mFrames.FirstChild());
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     lastFrame = frame;
   }
diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp
index e1a84dd2fd1..fac6fde5854 100644
--- a/mozilla/layout/forms/nsFileControlFrame.cpp
+++ b/mozilla/layout/forms/nsFileControlFrame.cpp
@@ -239,7 +239,7 @@ NS_IMETHODIMP nsFileControlFrame::Reflow(nsIPresContext&          aPresContext,
       maxSize.width  -= desiredSize.width;
       aDesiredSize.width  += desiredSize.width; 
       aDesiredSize.height = desiredSize.height;
-      childFrame->GetNextSibling(childFrame);
+      childFrame->GetNextSibling(&childFrame);
       offset.x += desiredSize.width + CONTROL_SPACING;
     }
   }
diff --git a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
index 0f3c3c5d2df..ca6bed66638 100644
--- a/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
+++ b/mozilla/layout/forms/nsHTMLButtonControlFrame.cpp
@@ -553,7 +553,7 @@ nsHTMLButtonControlFrame::SetInitialChildList(nsIPresContext& aPresContext,
   NS_RELEASE(styleContext);                                           
 
   // 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());
   }
 
diff --git a/mozilla/layout/forms/nsLegendFrame.cpp b/mozilla/layout/forms/nsLegendFrame.cpp
index f3d803e3196..66be43366ae 100644
--- a/mozilla/layout/forms/nsLegendFrame.cpp
+++ b/mozilla/layout/forms/nsLegendFrame.cpp
@@ -101,7 +101,7 @@ nsLegendFrame::SetInitialChildList(nsIPresContext& aPresContext,
   NS_RELEASE(styleContext);                                           
 
   // 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());
   }
 
diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp
index f4f94a163b7..5ec616496ee 100644
--- a/mozilla/layout/forms/nsListControlFrame.cpp
+++ b/mozilla/layout/forms/nsListControlFrame.cpp
@@ -208,7 +208,7 @@ nsListControlFrame::GetFrameForPointUsing(const nsPoint& aPoint,
       //*aFrame = kid;
       //return NS_OK;
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   mContentFrame->FirstChild(aList, &kid);
@@ -222,7 +222,7 @@ nsListControlFrame::GetFrameForPointUsing(const nsPoint& aPoint,
         return NS_OK;
       }
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
   *aFrame = this;
   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, insideWidth, desiredLineSize.height);
       childFrame->SetRect(rect);
-      childFrame->GetNextSibling(childFrame);
+      childFrame->GetNextSibling(&childFrame);
       offset.x = 0;
       offset.y += desiredLineSize.height;
     }
@@ -378,7 +378,7 @@ nsListControlFrame::GetOptionFromChild(nsIFrame* aParentFrame)
     if (nsnull != frame) {
       return frame;
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
   return nsnull;
 }
@@ -438,7 +438,7 @@ PRInt32 nsListControlFrame::SetContentSelected(nsIFrame *    aHitFrame,
       aHitContent->SetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::kClass, (aIsSelected?kSelectedFocus:kNormal), PR_TRUE);
       return index;
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
     index++;
   }
   return -1;
@@ -460,7 +460,7 @@ void nsListControlFrame::ClearSelection()
       }
     }
     NS_RELEASE(content);
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
     i++;
   }
 }
@@ -503,7 +503,7 @@ void nsListControlFrame::ExtendedSelection(PRInt32 aStartIndex, PRInt32 aEndInde
       startInverting = PR_FALSE;
     }
     NS_RELEASE(content);
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
     i++;
   }
 }
@@ -1046,7 +1046,7 @@ nsListControlFrame::AboutToDropDown()
       return NS_OK;
     }
     NS_RELEASE(content);
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
     i++;
   }
   return NS_OK;
@@ -1096,7 +1096,7 @@ nsListControlFrame::InitializeFromContent(PRBool aDoDisplay)
       NS_RELEASE(option);
     }
     NS_RELEASE(content);
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
     i++;
   }
 
diff --git a/mozilla/layout/generic/nsAreaFrame.cpp b/mozilla/layout/generic/nsAreaFrame.cpp
index c88f1b60fdb..3cb68a2d558 100644
--- a/mozilla/layout/generic/nsAreaFrame.cpp
+++ b/mozilla/layout/generic/nsAreaFrame.cpp
@@ -267,7 +267,7 @@ NS_IMETHODIMP
 nsAreaFrame::GetPositionedInfo(nscoord& aXMost, nscoord& aYMost) const
 {
   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
     nsRect  rect;
     f->GetRect(rect);
@@ -400,7 +400,7 @@ nsAreaFrame::IncrementalReflow(nsIPresContext&          aPresContext,
       nsReflowStatus  status;
 
       ReflowAbsoluteFrame(aPresContext, aReflowState, newFrames, PR_TRUE, status);
-      newFrames->GetNextSibling(newFrames);
+      newFrames->GetNextSibling(&newFrames);
     }
   }
 
@@ -671,7 +671,7 @@ nsAreaFrame::ReflowAbsoluteFrames(nsIPresContext&          aPresContext,
   }
 
   nsIFrame* kidFrame;
-  for (kidFrame = mAbsoluteFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) {
+  for (kidFrame = mAbsoluteFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
     // Reflow the frame
     nsReflowStatus  kidStatus;
     ReflowAbsoluteFrame(aPresContext, reflowState, kidFrame, PR_FALSE,
diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index ab2e8df0cf9..dad86068d63 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
   nsIFrame* frame = aLine->mFirstChild;
   PRInt32 n = aLine->mChildCount;
   while (--n >= 0) {
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 }
 #endif
@@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
     PRInt32 n = aLine->mChildCount;
     while ((--n >= 0) && NS_SUCCEEDED(rv)) {
       rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
-      child->GetNextSibling(child);
+      child->GetNextSibling(&child);
     }
     aLine = aLine->mNext;
   }
@@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
         else {
           rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       line = line->mNext;
     }
@@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
       fputs("<\n", out);
       while (nsnull != kid) {
         kid->List(out, aIndent + 1);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       IndentBy(out, aIndent);
       fputs(">\n", out);
@@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
     while (--n >= 0) {
       frame->SetParent(this);
       lastFrame = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     lastFrame->SetNextSibling(nsnull);
 
@@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
         }
         break;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
 
     // Pull frames and reflow them until we can't
@@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
     if (0 != --fromLine->mChildCount) {
       // Mark line dirty now that we pulled a child
       fromLine->MarkDirty();
-      frame->GetNextSibling(fromLine->mFirstChild);
+      frame->GetNextSibling(&fromLine->mFirstChild);
     }
     else {
       // 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);
     }
 
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   // 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)) {
         ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
     
     line = line->mNext;
@@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
   nsIFrame* frame = aFrame;
   for (;;) {
     nsIFrame* nextFrame;
-    frame->GetNextSibling(nextFrame);
+    frame->GetNextSibling(&nextFrame);
     if (nsnull != nextFrame) {
       const nsStyleDisplay* display;
       nextFrame->GetStyleData(eStyleStruct_Display,
@@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
         // Push continuation to a new line, but only if we actually
         // made one.
         if (madeContinuation) {
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
           nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
           if (nsnull == line) {
             return NS_ERROR_OUT_OF_MEMORY;
@@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       }
 
       // Split line, but after the frame just reflowed
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
     if (needSplit) {
       // Split line after the current frame
       aKeepLineGoing = PR_FALSE;
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
       if (NS_OK != rv) {
         return rv;
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
   }
   return NS_OK;
@@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
   PRInt32 n = aLine->ChildCount();
   while (--n >= 0) {
     FindFloatersIn(frame, floaters);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   aLine->mFloaters = floaters;
@@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
       while (nsnull != frame) {
         frame->SetParent(this);
         lastFrame = frame;
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
 
       // Join the line lists
@@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
   // Now create some lines for the new frames
   nsIFrame* prevFrame = lastFrame;
   for (nsIFrame* frame = aNewFrame; nsnull != frame;
-       frame->GetNextSibling(frame)) {
+       frame->GetNextSibling(&frame)) {
     // See if the child is a block or non-block
     const nsStyleDisplay* kidDisplay;
     rv = frame->GetStyleData(eStyleStruct_Display,
@@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
   nsIFrame* newFrame = aFrameList;
   while (nsnull != newFrame) {
     nsIFrame* next;
-    newFrame->GetNextSibling(next);
+    newFrame->GetNextSibling(&next);
     newFrame->SetNextSibling(nsnull);
 
     const nsStyleDisplay* display;
@@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
             for (i = 0; i < n; i++) {
               if (frame == aPrevSibling) {
                 nsIFrame* nextSibling;
-                aPrevSibling->GetNextSibling(nextSibling);
+                aPrevSibling->GetNextSibling(&nextSibling);
 
                 // Create new line to hold the remaining frames
                 NS_ASSERTION(n - i - 1 > 0, "bad line count");
@@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
                 line->mChildCount = i + 1;
                 break;
               }
-              frame->GetNextSibling(frame);
+              frame->GetNextSibling(&frame);
             }
 
             // 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
       // sibling list being in the "before insertion" state.
       nsIFrame* nextSibling;
-      aPrevSibling->GetNextSibling(nextSibling);
+      aPrevSibling->GetNextSibling(&nextSibling);
       newFrame->SetNextSibling(nextSibling);
       aPrevSibling->SetNextSibling(newFrame);
     }
@@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
         goto found_frame;
       }
       prevSibling = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     linep = &line->mNext;
     prevLine = line;
@@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
   NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
   if (nsnull != prevSibling) {
     nsIFrame* tmp;
-    prevSibling->GetNextSibling(tmp);
+    prevSibling->GetNextSibling(&tmp);
     NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
   }
 #endif
@@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
 
       // Get the deleted frames next sibling
       nsIFrame* nextFrame;
-      aDeletedFrame->GetNextSibling(nextFrame);
+      aDeletedFrame->GetNextSibling(&nextFrame);
 
       // Remove aDeletedFrame from the line
       if (line->mFirstChild == aDeletedFrame) {
@@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
 
     NS_RELEASE(tc);
     NS_RELEASE(content);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return PR_TRUE;
 }
@@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
     PRInt32 n = line->ChildCount();
     while (--n >= 0) {
       nsIFrame* nextChild;
-      child->GetNextSibling(nextChild);
+      child->GetNextSibling(&nextChild);
       if (child == aChild) {
         NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
            ("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
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       break;
     }
@@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
           // We found a non-zero sized child frame that precedes aFrame
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
     }
   
@@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
       while (--n >= 0) {
         PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
                    aWhichLayer);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
     }
   }
@@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     aLines = aLines->mNext;
   }
@@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
   }
   return PR_FALSE;
@@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
           }
         }
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     block = (nsBlockFrame*) block->mNextInFlow;
   }
@@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
           // therefore it will end an open text run.
           ll.EndTextRun();
         }
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
     }
     else {
@@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
   while (nsnull != frame) {
     frame->SetParent(this);
     lastFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   // Join the line lists
@@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
       // Remove frame from line and mark the line dirty
       --line->mChildCount;
       line->MarkDirty();
-      firstChild->GetNextSibling(line->mFirstChild);
+      firstChild->GetNextSibling(&line->mFirstChild);
     }
 
     // Break linkage to next child after stolen frame
@@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
             done = PR_TRUE;
             break;
           }
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
         }
         if (done) {
           break;
diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp
index ab2e8df0cf9..dad86068d63 100644
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/layout/generic/nsBlockReflowState.cpp
@@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
   nsIFrame* frame = aLine->mFirstChild;
   PRInt32 n = aLine->mChildCount;
   while (--n >= 0) {
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 }
 #endif
@@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
     PRInt32 n = aLine->mChildCount;
     while ((--n >= 0) && NS_SUCCEEDED(rv)) {
       rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
-      child->GetNextSibling(child);
+      child->GetNextSibling(&child);
     }
     aLine = aLine->mNext;
   }
@@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
         else {
           rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       line = line->mNext;
     }
@@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
       fputs("<\n", out);
       while (nsnull != kid) {
         kid->List(out, aIndent + 1);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       IndentBy(out, aIndent);
       fputs(">\n", out);
@@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
     while (--n >= 0) {
       frame->SetParent(this);
       lastFrame = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     lastFrame->SetNextSibling(nsnull);
 
@@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
         }
         break;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
 
     // Pull frames and reflow them until we can't
@@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
     if (0 != --fromLine->mChildCount) {
       // Mark line dirty now that we pulled a child
       fromLine->MarkDirty();
-      frame->GetNextSibling(fromLine->mFirstChild);
+      frame->GetNextSibling(&fromLine->mFirstChild);
     }
     else {
       // 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);
     }
 
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   // 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)) {
         ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
     
     line = line->mNext;
@@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
   nsIFrame* frame = aFrame;
   for (;;) {
     nsIFrame* nextFrame;
-    frame->GetNextSibling(nextFrame);
+    frame->GetNextSibling(&nextFrame);
     if (nsnull != nextFrame) {
       const nsStyleDisplay* display;
       nextFrame->GetStyleData(eStyleStruct_Display,
@@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
         // Push continuation to a new line, but only if we actually
         // made one.
         if (madeContinuation) {
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
           nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
           if (nsnull == line) {
             return NS_ERROR_OUT_OF_MEMORY;
@@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       }
 
       // Split line, but after the frame just reflowed
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
     if (needSplit) {
       // Split line after the current frame
       aKeepLineGoing = PR_FALSE;
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
       if (NS_OK != rv) {
         return rv;
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
   }
   return NS_OK;
@@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
   PRInt32 n = aLine->ChildCount();
   while (--n >= 0) {
     FindFloatersIn(frame, floaters);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   aLine->mFloaters = floaters;
@@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
       while (nsnull != frame) {
         frame->SetParent(this);
         lastFrame = frame;
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
 
       // Join the line lists
@@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
   // Now create some lines for the new frames
   nsIFrame* prevFrame = lastFrame;
   for (nsIFrame* frame = aNewFrame; nsnull != frame;
-       frame->GetNextSibling(frame)) {
+       frame->GetNextSibling(&frame)) {
     // See if the child is a block or non-block
     const nsStyleDisplay* kidDisplay;
     rv = frame->GetStyleData(eStyleStruct_Display,
@@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
   nsIFrame* newFrame = aFrameList;
   while (nsnull != newFrame) {
     nsIFrame* next;
-    newFrame->GetNextSibling(next);
+    newFrame->GetNextSibling(&next);
     newFrame->SetNextSibling(nsnull);
 
     const nsStyleDisplay* display;
@@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
             for (i = 0; i < n; i++) {
               if (frame == aPrevSibling) {
                 nsIFrame* nextSibling;
-                aPrevSibling->GetNextSibling(nextSibling);
+                aPrevSibling->GetNextSibling(&nextSibling);
 
                 // Create new line to hold the remaining frames
                 NS_ASSERTION(n - i - 1 > 0, "bad line count");
@@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
                 line->mChildCount = i + 1;
                 break;
               }
-              frame->GetNextSibling(frame);
+              frame->GetNextSibling(&frame);
             }
 
             // 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
       // sibling list being in the "before insertion" state.
       nsIFrame* nextSibling;
-      aPrevSibling->GetNextSibling(nextSibling);
+      aPrevSibling->GetNextSibling(&nextSibling);
       newFrame->SetNextSibling(nextSibling);
       aPrevSibling->SetNextSibling(newFrame);
     }
@@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
         goto found_frame;
       }
       prevSibling = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     linep = &line->mNext;
     prevLine = line;
@@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
   NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
   if (nsnull != prevSibling) {
     nsIFrame* tmp;
-    prevSibling->GetNextSibling(tmp);
+    prevSibling->GetNextSibling(&tmp);
     NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
   }
 #endif
@@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
 
       // Get the deleted frames next sibling
       nsIFrame* nextFrame;
-      aDeletedFrame->GetNextSibling(nextFrame);
+      aDeletedFrame->GetNextSibling(&nextFrame);
 
       // Remove aDeletedFrame from the line
       if (line->mFirstChild == aDeletedFrame) {
@@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
 
     NS_RELEASE(tc);
     NS_RELEASE(content);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return PR_TRUE;
 }
@@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
     PRInt32 n = line->ChildCount();
     while (--n >= 0) {
       nsIFrame* nextChild;
-      child->GetNextSibling(nextChild);
+      child->GetNextSibling(&nextChild);
       if (child == aChild) {
         NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
            ("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
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       break;
     }
@@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
           // We found a non-zero sized child frame that precedes aFrame
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
     }
   
@@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
       while (--n >= 0) {
         PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
                    aWhichLayer);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
     }
   }
@@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     aLines = aLines->mNext;
   }
@@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
   }
   return PR_FALSE;
@@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
           }
         }
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     block = (nsBlockFrame*) block->mNextInFlow;
   }
@@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
           // therefore it will end an open text run.
           ll.EndTextRun();
         }
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
     }
     else {
@@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
   while (nsnull != frame) {
     frame->SetParent(this);
     lastFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   // Join the line lists
@@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
       // Remove frame from line and mark the line dirty
       --line->mChildCount;
       line->MarkDirty();
-      firstChild->GetNextSibling(line->mFirstChild);
+      firstChild->GetNextSibling(&line->mFirstChild);
     }
 
     // Break linkage to next child after stolen frame
@@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
             done = PR_TRUE;
             break;
           }
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
         }
         if (done) {
           break;
diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h
index ab2e8df0cf9..dad86068d63 100644
--- a/mozilla/layout/generic/nsBlockReflowState.h
+++ b/mozilla/layout/generic/nsBlockReflowState.h
@@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
   nsIFrame* frame = aLine->mFirstChild;
   PRInt32 n = aLine->mChildCount;
   while (--n >= 0) {
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 }
 #endif
@@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
     PRInt32 n = aLine->mChildCount;
     while ((--n >= 0) && NS_SUCCEEDED(rv)) {
       rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
-      child->GetNextSibling(child);
+      child->GetNextSibling(&child);
     }
     aLine = aLine->mNext;
   }
@@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
         else {
           rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       line = line->mNext;
     }
@@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
       fputs("<\n", out);
       while (nsnull != kid) {
         kid->List(out, aIndent + 1);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       IndentBy(out, aIndent);
       fputs(">\n", out);
@@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
     while (--n >= 0) {
       frame->SetParent(this);
       lastFrame = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     lastFrame->SetNextSibling(nsnull);
 
@@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
         }
         break;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
 
     // Pull frames and reflow them until we can't
@@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
     if (0 != --fromLine->mChildCount) {
       // Mark line dirty now that we pulled a child
       fromLine->MarkDirty();
-      frame->GetNextSibling(fromLine->mFirstChild);
+      frame->GetNextSibling(&fromLine->mFirstChild);
     }
     else {
       // 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);
     }
 
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   // 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)) {
         ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
     
     line = line->mNext;
@@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
   nsIFrame* frame = aFrame;
   for (;;) {
     nsIFrame* nextFrame;
-    frame->GetNextSibling(nextFrame);
+    frame->GetNextSibling(&nextFrame);
     if (nsnull != nextFrame) {
       const nsStyleDisplay* display;
       nextFrame->GetStyleData(eStyleStruct_Display,
@@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
         // Push continuation to a new line, but only if we actually
         // made one.
         if (madeContinuation) {
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
           nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
           if (nsnull == line) {
             return NS_ERROR_OUT_OF_MEMORY;
@@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       }
 
       // Split line, but after the frame just reflowed
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
     if (needSplit) {
       // Split line after the current frame
       aKeepLineGoing = PR_FALSE;
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
       if (NS_OK != rv) {
         return rv;
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
   }
   return NS_OK;
@@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
   PRInt32 n = aLine->ChildCount();
   while (--n >= 0) {
     FindFloatersIn(frame, floaters);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   aLine->mFloaters = floaters;
@@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
       while (nsnull != frame) {
         frame->SetParent(this);
         lastFrame = frame;
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
 
       // Join the line lists
@@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
   // Now create some lines for the new frames
   nsIFrame* prevFrame = lastFrame;
   for (nsIFrame* frame = aNewFrame; nsnull != frame;
-       frame->GetNextSibling(frame)) {
+       frame->GetNextSibling(&frame)) {
     // See if the child is a block or non-block
     const nsStyleDisplay* kidDisplay;
     rv = frame->GetStyleData(eStyleStruct_Display,
@@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
   nsIFrame* newFrame = aFrameList;
   while (nsnull != newFrame) {
     nsIFrame* next;
-    newFrame->GetNextSibling(next);
+    newFrame->GetNextSibling(&next);
     newFrame->SetNextSibling(nsnull);
 
     const nsStyleDisplay* display;
@@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
             for (i = 0; i < n; i++) {
               if (frame == aPrevSibling) {
                 nsIFrame* nextSibling;
-                aPrevSibling->GetNextSibling(nextSibling);
+                aPrevSibling->GetNextSibling(&nextSibling);
 
                 // Create new line to hold the remaining frames
                 NS_ASSERTION(n - i - 1 > 0, "bad line count");
@@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
                 line->mChildCount = i + 1;
                 break;
               }
-              frame->GetNextSibling(frame);
+              frame->GetNextSibling(&frame);
             }
 
             // 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
       // sibling list being in the "before insertion" state.
       nsIFrame* nextSibling;
-      aPrevSibling->GetNextSibling(nextSibling);
+      aPrevSibling->GetNextSibling(&nextSibling);
       newFrame->SetNextSibling(nextSibling);
       aPrevSibling->SetNextSibling(newFrame);
     }
@@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
         goto found_frame;
       }
       prevSibling = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     linep = &line->mNext;
     prevLine = line;
@@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
   NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
   if (nsnull != prevSibling) {
     nsIFrame* tmp;
-    prevSibling->GetNextSibling(tmp);
+    prevSibling->GetNextSibling(&tmp);
     NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
   }
 #endif
@@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
 
       // Get the deleted frames next sibling
       nsIFrame* nextFrame;
-      aDeletedFrame->GetNextSibling(nextFrame);
+      aDeletedFrame->GetNextSibling(&nextFrame);
 
       // Remove aDeletedFrame from the line
       if (line->mFirstChild == aDeletedFrame) {
@@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
 
     NS_RELEASE(tc);
     NS_RELEASE(content);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return PR_TRUE;
 }
@@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
     PRInt32 n = line->ChildCount();
     while (--n >= 0) {
       nsIFrame* nextChild;
-      child->GetNextSibling(nextChild);
+      child->GetNextSibling(&nextChild);
       if (child == aChild) {
         NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
            ("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
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       break;
     }
@@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
           // We found a non-zero sized child frame that precedes aFrame
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
     }
   
@@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
       while (--n >= 0) {
         PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
                    aWhichLayer);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
     }
   }
@@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     aLines = aLines->mNext;
   }
@@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
   }
   return PR_FALSE;
@@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
           }
         }
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     block = (nsBlockFrame*) block->mNextInFlow;
   }
@@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
           // therefore it will end an open text run.
           ll.EndTextRun();
         }
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
     }
     else {
@@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
   while (nsnull != frame) {
     frame->SetParent(this);
     lastFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   // Join the line lists
@@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
       // Remove frame from line and mark the line dirty
       --line->mChildCount;
       line->MarkDirty();
-      firstChild->GetNextSibling(line->mFirstChild);
+      firstChild->GetNextSibling(&line->mFirstChild);
     }
 
     // Break linkage to next child after stolen frame
@@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
             done = PR_TRUE;
             break;
           }
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
         }
         if (done) {
           break;
diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp
index 121f88141a1..2bcf0ed367c 100644
--- a/mozilla/layout/generic/nsContainerFrame.cpp
+++ b/mozilla/layout/generic/nsContainerFrame.cpp
@@ -102,7 +102,7 @@ nsContainerFrame::DidReflow(nsIPresContext& aPresContext,
         if (NS_SUCCEEDED(rv)) {
           htmlReflow->DidReflow(aPresContext, aStatus);
         }
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       NS_IF_RELEASE(listName);
       GetAdditionalChildListName(listIndex++, &listName);
@@ -148,14 +148,14 @@ nsContainerFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
     result = FirstChild(nsnull, &child);
     while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
       result = child->ReResolveStyleContext(aPresContext, mStyleContext);
-      child->GetNextSibling(child);
+      child->GetNextSibling(&child);
     }
 
     // Update overflow list too
     child = mOverflowFrames.FirstChild();
     while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
       result = child->ReResolveStyleContext(aPresContext, mStyleContext);
-      child->GetNextSibling(child);
+      child->GetNextSibling(&child);
     }
 
     // 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();
       while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
         result = child->ReResolveStyleContext(aPresContext, mStyleContext);
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
     }
   }
@@ -214,7 +214,7 @@ nsContainerFrame::PaintChildren(nsIPresContext&      aPresContext,
   nsIFrame* kid = mFrames.FirstChild();
   while (nsnull != kid) {
     PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer);
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   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);
       return kid->GetFrameForPoint(tmp, aFrame);
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   FirstChild(aList, &kid);
@@ -326,7 +326,7 @@ nsContainerFrame::GetFrameForPointUsing(const nsPoint& aPoint,
         return NS_OK;
       }
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
   *aFrame = this;
   return NS_ERROR_FAILURE;
@@ -419,7 +419,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
   // Take the next-in-flow out of the parent's child list
   if (parent->mFrames.FirstChild() == nextInFlow) {
     nsIFrame* nextFrame;
-    nextInFlow->GetNextSibling(nextFrame);
+    nextInFlow->GetNextSibling(&nextFrame);
     parent->mFrames.SetFrames(nextFrame);
   } else {
     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 not the last child in parent)
     NS_ASSERTION(((nsContainerFrame*)parent)->IsChild(aChild), "screwy flow");
-    aChild->GetNextSibling(nextSibling);
+    aChild->GetNextSibling(&nextSibling);
     NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling");
 
-    nextInFlow->GetNextSibling(nextSibling);
+    nextInFlow->GetNextSibling(&nextSibling);
     aChild->SetNextSibling(nextSibling);
   }
 
@@ -467,7 +467,7 @@ nsContainerFrame::PushChildren(nsIFrame* aFromChild, nsIFrame* aPrevSibling)
   NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child");
 #ifdef NS_DEBUG
   nsIFrame* prevNextSibling;
-  aPrevSibling->GetNextSibling(prevNextSibling);
+  aPrevSibling->GetNextSibling(&prevNextSibling);
   NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling");
 #endif
 
@@ -620,7 +620,7 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent) const
       fputs("<\n", out);
       while (nsnull != kid) {
         kid->List(out, aIndent + 1);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       IndentBy(out, aIndent);
       fputs(">\n", out);
diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp
index 3ce5555909b..9c467c04b09 100644
--- a/mozilla/layout/generic/nsFrame.cpp
+++ b/mozilla/layout/generic/nsFrame.cpp
@@ -1576,9 +1576,10 @@ NS_IMETHODIMP nsFrame::GetAutoMarginSize(PRUint8 aSide, nscoord& aSize) const
 
 // 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;
 }
 
@@ -1777,7 +1778,7 @@ nsFrame::DumpBaseRegressionData(FILE* out, PRInt32 aIndent)
       aIndent++;
       while (nsnull != kid) {
         kid->DumpRegressionData(out, aIndent);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       aIndent--;
       IndentBy(out, aIndent);
@@ -1833,7 +1834,7 @@ nsFrame::SetSelectedContentOffsets(PRBool aSelected, PRInt32 aBeginContentOffset
                                                aForceRedraw , aTracker, aActualSelected);
     if (NS_SUCCEEDED(result) && aActualSelected)
       return result; //done.
-    result |= child->GetNextSibling(child);
+    result |= child->GetNextSibling(&child);
   }
   return result;
 }
@@ -1956,7 +1957,7 @@ static void RefreshAllContentFrames(nsIFrame * aFrame, nsIContent * aContent)
   aFrame->FirstChild(nsnull, &aFrame);
   while (aFrame) {
     RefreshAllContentFrames(aFrame, aContent);
-    aFrame->GetNextSibling(aFrame);
+    aFrame->GetNextSibling(&aFrame);
   }
 }
 
diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h
index 3ac91e4c654..158c2e2a641 100644
--- a/mozilla/layout/generic/nsFrame.h
+++ b/mozilla/layout/generic/nsFrame.h
@@ -194,7 +194,7 @@ public:
   NS_IMETHOD  GetFrameType(nsIAtom** aType) const;
   NS_IMETHOD  IsPercentageBase(PRBool& aBase) 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  IsTransparent(PRBool& aTransparent) const;
   NS_IMETHOD  Scrolled(nsIView *aView);
diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp
index 1942d10a057..cfcc2bdc308 100644
--- a/mozilla/layout/generic/nsFrameSetFrame.cpp
+++ b/mozilla/layout/generic/nsFrameSetFrame.cpp
@@ -417,7 +417,7 @@ void nsHTMLFramesetFrame::GetSizeOfChild(nsIFrame* aChild,
   // this assumption is used here
   int i = 0;
   for (nsIFrame* child = mFrames.FirstChild(); child;
-       child->GetNextSibling(child)) {
+       child->GetNextSibling(&child)) {
     if (aChild == child) {
       nsPoint ignore;
       GetSizeOfChildAt(i, aSize, ignore);
@@ -1150,7 +1150,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext&          aPresContext,
     lastCol  = cellIndex.x;
     lastSize = size;
     offset.x += size.width;
-    child->GetNextSibling(child);
+    child->GetNextSibling(&child);
   }
 
   if (firstTime) {
diff --git a/mozilla/layout/generic/nsHTMLContainerFrame.cpp b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
index 93e6f02ff3f..f0aee09e3bb 100644
--- a/mozilla/layout/generic/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/generic/nsHTMLContainerFrame.cpp
@@ -123,7 +123,7 @@ nsHTMLContainerFrame::MoveFrameOutOfFlow(nsIPresContext&        aPresContext,
 
     // Set aFrame's next sibling to nsnull, and remember the current next
     // sibling pointer
-    aFrame->GetNextSibling(nextSibling);
+    aFrame->GetNextSibling(&nextSibling);
     aFrame->SetNextSibling(nsnull);
 
     // 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
     // into our lines child list.
     nsIFrame* nextFrame;
-    aFrame->GetNextSibling(nextFrame);
+    aFrame->GetNextSibling(&nextFrame);
     nsIStyleContext* kidSC;
     aFrame->GetStyleContext(&kidSC);
     aFrame->CreateContinuingFrame(aPresContext, aOuterFrame,
diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h
index 40c5f38fb85..535dc0c0ba1 100644
--- a/mozilla/layout/generic/nsIFrame.h
+++ b/mozilla/layout/generic/nsIFrame.h
@@ -339,7 +339,7 @@ public:
   /**
    * 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;
 
   /**
diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp
index c31f7720838..d3506bbb8be 100644
--- a/mozilla/layout/generic/nsInlineFrame.cpp
+++ b/mozilla/layout/generic/nsInlineFrame.cpp
@@ -239,7 +239,7 @@ nsInlineFrame::SectionData::SectionData(nsIFrame* aFrameList)
       }
     }
     lastFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 }
 
@@ -264,7 +264,7 @@ nsInlineFrame::SectionData::SplitFrameList(nsFrameList& aSection1,
   if (lastFrame != lastBlock) {
     // There are inline frames that follow the last block. Setup section3.
     nsIFrame* remainder;
-    lastBlock->GetNextSibling(remainder);
+    lastBlock->GetNextSibling(&remainder);
     lastBlock->SetNextSibling(nsnull);
     aSection3.SetFrames(remainder);
   }
@@ -346,7 +346,7 @@ nsInlineFrame::MoveOutOfFlow(nsIPresContext& aPresContext,
       frame = placeholder;
     }
     prevFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return NS_OK;
 }
@@ -367,7 +367,7 @@ nsInlineFrame::FindPrevAnonymousBlock(nsInlineFrame** aBlockParent)
         *aBlockParent = prevInFlow;
         return (nsAnonymousBlockFrame*) frame;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     prevInFlow = (nsInlineFrame*) prevInFlow->mPrevInFlow;
   }
@@ -390,7 +390,7 @@ nsInlineFrame::FindAnonymousBlock(nsInlineFrame** aBlockParent)
         *aBlockParent = nextInFlow;
         return (nsAnonymousBlockFrame*) frame;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     nextInFlow = (nsInlineFrame*) nextInFlow->mNextInFlow;
   }
@@ -421,7 +421,7 @@ nsInlineFrame::CreateAnonymousBlock(nsIPresContext& aPresContext,
       nsIFrame* frame = aInitialFrames;
       while (nsnull != frame) {
         frame->SetParent(bf);
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
       rv = bf->SetInitialChildList(aPresContext, nsnull, aInitialFrames);
     }
@@ -504,7 +504,7 @@ nsInlineFrame::AppendFrames(nsIPresContext& aPresContext,
       // this frame, stealing children from our continuation frames as
       // necessary.
       nsIFrame* inlineSiblings;
-      anonymousBlock->GetNextSibling(inlineSiblings);
+      anonymousBlock->GetNextSibling(&inlineSiblings);
       nsFrameList newBlockFrames;
       if (nsnull != inlineSiblings) {
         newBlockFrames.AppendFrames(anonymousBlock, inlineSiblings);
@@ -715,7 +715,7 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext,
       nsIFrame* frame = aFrameList;
       while (nsnull != frame) {
         frame->SetParent(prevFrameParent);
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
       nsAnonymousBlockFrame* anonymousBlock;
       anonymousBlock = (nsAnonymousBlockFrame*) prevFrameParent;
@@ -872,7 +872,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
       // frames into the anonymous block if they should be in
       // section3.
       nsIFrame* nextSibling;
-      aPrevFrame->GetNextSibling(nextSibling);
+      aPrevFrame->GetNextSibling(&nextSibling);
       nsIFrame* anonymousBlockNextInFlow;
       prevFrameParent->GetNextInFlow(anonymousBlockNextInFlow);
       if ((nsnull != nextSibling) || (nsnull != anonymousBlockNextInFlow)) {
@@ -881,7 +881,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
         nsIFrame* frame = aFrameList;
         while (nsnull != frame) {
           frame->SetParent(anonymousBlock);
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
         }
         anonymousBlock->InsertFrames2(aPresContext, aPresShell, nsnull,
                                       aPrevFrame, aFrameList);
@@ -899,7 +899,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
         nsIFrame* frame = aFrameList;
         while (nsnull != frame) {
           frame->SetParent(anonymousBlockParent);
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
         }
         anonymousBlockParent->mFrames.InsertFrames(nsnull, anonymousBlock,
                                                    aFrameList);
@@ -1001,7 +1001,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
           // last block in the anonymous block.
           anonymousBlock->GetNextInFlow(nextInFlow);
           nsIFrame* nextSib;
-          aOldFrame->GetNextSibling(nextSib);
+          aOldFrame->GetNextSibling(&nextSib);
           if ((nsnull != nextInFlow) || (nsnull != nextSib)) {
             // There is a block in the anonymous block after the block
             // that we are removing. This means that we can let the
@@ -1051,7 +1051,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
                 SectionData sd(kids);
                 if (sd.HasABlock()) {
                   kids = sd.lastBlock;
-                  kids->GetNextSibling(kids);
+                  kids->GetNextSibling(&kids);
                   if (nsnull != kids) {
                     // Take the frames that follow the last block
                     // (which are inline frames) and remove them from
@@ -1127,7 +1127,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
                 break;
               }
               nsIFrame* next;
-              kid->GetNextSibling(next);
+              kid->GetNextSibling(&next);
               anonymousBlock->RemoveFirstFrame();
               frames.AppendFrame(nsnull, kid);
               kid = next;
@@ -1354,7 +1354,7 @@ nsInlineFrame::ReflowInlineFrames(ReflowState& rs,
       break;
     }
     rs.prevFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   // Attempt to pull frames from our next-in-flow until we can't
@@ -1453,7 +1453,7 @@ nsInlineFrame::ReflowInlineFrame(ReflowState& rs,
         }
       }
       nsIFrame* nextFrame;
-      aFrame->GetNextSibling(nextFrame);
+      aFrame->GetNextSibling(&nextFrame);
       if (nsnull != nextFrame) {
         aStatus |= NS_FRAME_NOT_COMPLETE;
         PushFrames(nextFrame, aFrame);
@@ -1479,7 +1479,7 @@ nsInlineFrame::ReflowInlineFrame(ReflowState& rs,
       return rv;
     }
     nsIFrame* nextFrame;
-    aFrame->GetNextSibling(nextFrame);
+    aFrame->GetNextSibling(&nextFrame);
     if (nsnull != nextFrame) {
       PushFrames(nextFrame, aFrame);
     }
@@ -1559,7 +1559,7 @@ nsInlineFrame::PushFrames(nsIFrame* aFromChild, nsIFrame* aPrevSibling)
   NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child");
 #ifdef NS_DEBUG
   nsIFrame* prevNextSibling;
-  aPrevSibling->GetNextSibling(prevNextSibling);
+  aPrevSibling->GetNextSibling(&prevNextSibling);
   NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling");
 #endif
 
@@ -1637,7 +1637,7 @@ nsInlineFrame::ReflowBlockFrame(ReflowState& rs,
       // inline frames. Make sure we reflect that in our reflow status
       // and push them to our next-in-flow.
       nsIFrame* nextFrame;
-      blockFrame->GetNextSibling(nextFrame);
+      blockFrame->GetNextSibling(&nextFrame);
       if (nsnull != nextFrame) {
         PushFrames(nextFrame, blockFrame);
         aStatus |= NS_FRAME_NOT_COMPLETE;
diff --git a/mozilla/layout/generic/nsLineBox.cpp b/mozilla/layout/generic/nsLineBox.cpp
index b5a56ec59a1..622474519b1 100644
--- a/mozilla/layout/generic/nsLineBox.cpp
+++ b/mozilla/layout/generic/nsLineBox.cpp
@@ -94,7 +94,7 @@ nsLineBox::List(FILE* out, PRInt32 aIndent) const
   PRInt32 n = ChildCount();
   while (--n >= 0) {
     frame->List(out, aIndent + 1);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   for (i = aIndent; --i >= 0; ) fputs("  ", out);
@@ -112,7 +112,7 @@ nsLineBox::LastChild() const
   nsIFrame* frame = mFirstChild;
   PRInt32 n = ChildCount() - 1;
   while (--n >= 0) {
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return frame;
 }
@@ -133,7 +133,7 @@ nsLineBox::Contains(nsIFrame* aFrame) const
     if (frame == aFrame) {
       return PR_TRUE;
     }
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return PR_FALSE;
 }
@@ -223,7 +223,7 @@ nsLineBox::DeleteLineList(nsIPresContext& aPresContext, nsLineBox* aLine)
     // view.
     for (nsIFrame* child = aLine->mFirstChild; child; ) {
       nsIFrame* nextChild;
-      child->GetNextSibling(nextChild);
+      child->GetNextSibling(&nextChild);
       child->DeleteFrame(aPresContext);
       child = nextChild;
     }
diff --git a/mozilla/layout/generic/nsSimplePageSequence.cpp b/mozilla/layout/generic/nsSimplePageSequence.cpp
index 523401acfe3..67d4a46661c 100644
--- a/mozilla/layout/generic/nsSimplePageSequence.cpp
+++ b/mozilla/layout/generic/nsSimplePageSequence.cpp
@@ -88,7 +88,7 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext&          aPresContext,
 
     // Compute the y-offset of this page
     for (nsIFrame* f = mFrames.FirstChild(); f != nextFrame;
-         f->GetNextSibling(f)) {
+         f->GetNextSibling(&f)) {
       nsSize  size;
 
       f->GetSize(size);
@@ -111,13 +111,13 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext&          aPresContext,
     // XXX Check if the page is complete...
 
     // Update the y-offset to reflect the remaining pages
-    nextFrame->GetNextSibling(nextFrame);
+    nextFrame->GetNextSibling(&nextFrame);
     while (nsnull != nextFrame) {
       nsSize  size;
 
       nextFrame->GetSize(size);
       y += size.height + PAGE_SPACING_TWIPS;
-      nextFrame->GetNextSibling(nextFrame);
+      nextFrame->GetNextSibling(&nextFrame);
     }
 
   } else {
@@ -163,14 +163,14 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext&          aPresContext,
         // Add it to our child list
 #ifdef NS_DEBUG
         nsIFrame* kidNextSibling;
-        kidFrame->GetNextSibling(kidNextSibling);
+        kidFrame->GetNextSibling(&kidNextSibling);
         NS_ASSERTION(nsnull == kidNextSibling, "unexpected sibling");
 #endif
         kidFrame->SetNextSibling(continuingPage);
       }
 
       // Get the next page
-      kidFrame->GetNextSibling(kidFrame);
+      kidFrame->GetNextSibling(&kidFrame);
     }
   }
 
@@ -276,7 +276,7 @@ nsSimplePageSequenceFrame::Print(nsIPresContext&         aPresContext,
 
   // Print each specified page
   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
     PRBool  printThisPage = PR_TRUE;
 
diff --git a/mozilla/layout/generic/nsViewportFrame.cpp b/mozilla/layout/generic/nsViewportFrame.cpp
index 903e1cfacb0..a7fb4def7f3 100644
--- a/mozilla/layout/generic/nsViewportFrame.cpp
+++ b/mozilla/layout/generic/nsViewportFrame.cpp
@@ -264,7 +264,7 @@ ViewportFrame::ReflowFixedFrames(nsIPresContext&          aPresContext,
   reflowState.computedHeight = height;
 
   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
     nsReflowStatus  kidStatus;
     ReflowFixedFrame(aPresContext, reflowState, kidFrame, PR_FALSE, kidStatus);
@@ -338,7 +338,7 @@ ViewportFrame::IncrementalReflow(nsIPresContext&          aPresContext,
 
       nsReflowStatus  status;
       ReflowFixedFrame(aPresContext, reflowState, newFrames, PR_TRUE, status);
-      newFrames->GetNextSibling(newFrames);
+      newFrames->GetNextSibling(&newFrames);
     }
   }
 
diff --git a/mozilla/layout/html/base/src/nsAreaFrame.cpp b/mozilla/layout/html/base/src/nsAreaFrame.cpp
index c88f1b60fdb..3cb68a2d558 100644
--- a/mozilla/layout/html/base/src/nsAreaFrame.cpp
+++ b/mozilla/layout/html/base/src/nsAreaFrame.cpp
@@ -267,7 +267,7 @@ NS_IMETHODIMP
 nsAreaFrame::GetPositionedInfo(nscoord& aXMost, nscoord& aYMost) const
 {
   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
     nsRect  rect;
     f->GetRect(rect);
@@ -400,7 +400,7 @@ nsAreaFrame::IncrementalReflow(nsIPresContext&          aPresContext,
       nsReflowStatus  status;
 
       ReflowAbsoluteFrame(aPresContext, aReflowState, newFrames, PR_TRUE, status);
-      newFrames->GetNextSibling(newFrames);
+      newFrames->GetNextSibling(&newFrames);
     }
   }
 
@@ -671,7 +671,7 @@ nsAreaFrame::ReflowAbsoluteFrames(nsIPresContext&          aPresContext,
   }
 
   nsIFrame* kidFrame;
-  for (kidFrame = mAbsoluteFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) {
+  for (kidFrame = mAbsoluteFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) {
     // Reflow the frame
     nsReflowStatus  kidStatus;
     ReflowAbsoluteFrame(aPresContext, reflowState, kidFrame, PR_FALSE,
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index ab2e8df0cf9..dad86068d63 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
   nsIFrame* frame = aLine->mFirstChild;
   PRInt32 n = aLine->mChildCount;
   while (--n >= 0) {
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 }
 #endif
@@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
     PRInt32 n = aLine->mChildCount;
     while ((--n >= 0) && NS_SUCCEEDED(rv)) {
       rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
-      child->GetNextSibling(child);
+      child->GetNextSibling(&child);
     }
     aLine = aLine->mNext;
   }
@@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
         else {
           rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       line = line->mNext;
     }
@@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
       fputs("<\n", out);
       while (nsnull != kid) {
         kid->List(out, aIndent + 1);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       IndentBy(out, aIndent);
       fputs(">\n", out);
@@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
     while (--n >= 0) {
       frame->SetParent(this);
       lastFrame = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     lastFrame->SetNextSibling(nsnull);
 
@@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
         }
         break;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
 
     // Pull frames and reflow them until we can't
@@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
     if (0 != --fromLine->mChildCount) {
       // Mark line dirty now that we pulled a child
       fromLine->MarkDirty();
-      frame->GetNextSibling(fromLine->mFirstChild);
+      frame->GetNextSibling(&fromLine->mFirstChild);
     }
     else {
       // 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);
     }
 
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   // 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)) {
         ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
     
     line = line->mNext;
@@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
   nsIFrame* frame = aFrame;
   for (;;) {
     nsIFrame* nextFrame;
-    frame->GetNextSibling(nextFrame);
+    frame->GetNextSibling(&nextFrame);
     if (nsnull != nextFrame) {
       const nsStyleDisplay* display;
       nextFrame->GetStyleData(eStyleStruct_Display,
@@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
         // Push continuation to a new line, but only if we actually
         // made one.
         if (madeContinuation) {
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
           nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
           if (nsnull == line) {
             return NS_ERROR_OUT_OF_MEMORY;
@@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       }
 
       // Split line, but after the frame just reflowed
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
     if (needSplit) {
       // Split line after the current frame
       aKeepLineGoing = PR_FALSE;
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
       if (NS_OK != rv) {
         return rv;
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
   }
   return NS_OK;
@@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
   PRInt32 n = aLine->ChildCount();
   while (--n >= 0) {
     FindFloatersIn(frame, floaters);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   aLine->mFloaters = floaters;
@@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
       while (nsnull != frame) {
         frame->SetParent(this);
         lastFrame = frame;
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
 
       // Join the line lists
@@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
   // Now create some lines for the new frames
   nsIFrame* prevFrame = lastFrame;
   for (nsIFrame* frame = aNewFrame; nsnull != frame;
-       frame->GetNextSibling(frame)) {
+       frame->GetNextSibling(&frame)) {
     // See if the child is a block or non-block
     const nsStyleDisplay* kidDisplay;
     rv = frame->GetStyleData(eStyleStruct_Display,
@@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
   nsIFrame* newFrame = aFrameList;
   while (nsnull != newFrame) {
     nsIFrame* next;
-    newFrame->GetNextSibling(next);
+    newFrame->GetNextSibling(&next);
     newFrame->SetNextSibling(nsnull);
 
     const nsStyleDisplay* display;
@@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
             for (i = 0; i < n; i++) {
               if (frame == aPrevSibling) {
                 nsIFrame* nextSibling;
-                aPrevSibling->GetNextSibling(nextSibling);
+                aPrevSibling->GetNextSibling(&nextSibling);
 
                 // Create new line to hold the remaining frames
                 NS_ASSERTION(n - i - 1 > 0, "bad line count");
@@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
                 line->mChildCount = i + 1;
                 break;
               }
-              frame->GetNextSibling(frame);
+              frame->GetNextSibling(&frame);
             }
 
             // 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
       // sibling list being in the "before insertion" state.
       nsIFrame* nextSibling;
-      aPrevSibling->GetNextSibling(nextSibling);
+      aPrevSibling->GetNextSibling(&nextSibling);
       newFrame->SetNextSibling(nextSibling);
       aPrevSibling->SetNextSibling(newFrame);
     }
@@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
         goto found_frame;
       }
       prevSibling = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     linep = &line->mNext;
     prevLine = line;
@@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
   NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
   if (nsnull != prevSibling) {
     nsIFrame* tmp;
-    prevSibling->GetNextSibling(tmp);
+    prevSibling->GetNextSibling(&tmp);
     NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
   }
 #endif
@@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
 
       // Get the deleted frames next sibling
       nsIFrame* nextFrame;
-      aDeletedFrame->GetNextSibling(nextFrame);
+      aDeletedFrame->GetNextSibling(&nextFrame);
 
       // Remove aDeletedFrame from the line
       if (line->mFirstChild == aDeletedFrame) {
@@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
 
     NS_RELEASE(tc);
     NS_RELEASE(content);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return PR_TRUE;
 }
@@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
     PRInt32 n = line->ChildCount();
     while (--n >= 0) {
       nsIFrame* nextChild;
-      child->GetNextSibling(nextChild);
+      child->GetNextSibling(&nextChild);
       if (child == aChild) {
         NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
            ("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
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       break;
     }
@@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
           // We found a non-zero sized child frame that precedes aFrame
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
     }
   
@@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
       while (--n >= 0) {
         PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
                    aWhichLayer);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
     }
   }
@@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     aLines = aLines->mNext;
   }
@@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
   }
   return PR_FALSE;
@@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
           }
         }
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     block = (nsBlockFrame*) block->mNextInFlow;
   }
@@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
           // therefore it will end an open text run.
           ll.EndTextRun();
         }
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
     }
     else {
@@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
   while (nsnull != frame) {
     frame->SetParent(this);
     lastFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   // Join the line lists
@@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
       // Remove frame from line and mark the line dirty
       --line->mChildCount;
       line->MarkDirty();
-      firstChild->GetNextSibling(line->mFirstChild);
+      firstChild->GetNextSibling(&line->mFirstChild);
     }
 
     // Break linkage to next child after stolen frame
@@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
             done = PR_TRUE;
             break;
           }
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
         }
         if (done) {
           break;
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
index ab2e8df0cf9..dad86068d63 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
@@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
   nsIFrame* frame = aLine->mFirstChild;
   PRInt32 n = aLine->mChildCount;
   while (--n >= 0) {
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 }
 #endif
@@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
     PRInt32 n = aLine->mChildCount;
     while ((--n >= 0) && NS_SUCCEEDED(rv)) {
       rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
-      child->GetNextSibling(child);
+      child->GetNextSibling(&child);
     }
     aLine = aLine->mNext;
   }
@@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
         else {
           rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       line = line->mNext;
     }
@@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
       fputs("<\n", out);
       while (nsnull != kid) {
         kid->List(out, aIndent + 1);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       IndentBy(out, aIndent);
       fputs(">\n", out);
@@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
     while (--n >= 0) {
       frame->SetParent(this);
       lastFrame = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     lastFrame->SetNextSibling(nsnull);
 
@@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
         }
         break;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
 
     // Pull frames and reflow them until we can't
@@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
     if (0 != --fromLine->mChildCount) {
       // Mark line dirty now that we pulled a child
       fromLine->MarkDirty();
-      frame->GetNextSibling(fromLine->mFirstChild);
+      frame->GetNextSibling(&fromLine->mFirstChild);
     }
     else {
       // 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);
     }
 
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   // 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)) {
         ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
     
     line = line->mNext;
@@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
   nsIFrame* frame = aFrame;
   for (;;) {
     nsIFrame* nextFrame;
-    frame->GetNextSibling(nextFrame);
+    frame->GetNextSibling(&nextFrame);
     if (nsnull != nextFrame) {
       const nsStyleDisplay* display;
       nextFrame->GetStyleData(eStyleStruct_Display,
@@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
         // Push continuation to a new line, but only if we actually
         // made one.
         if (madeContinuation) {
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
           nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
           if (nsnull == line) {
             return NS_ERROR_OUT_OF_MEMORY;
@@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       }
 
       // Split line, but after the frame just reflowed
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
     if (needSplit) {
       // Split line after the current frame
       aKeepLineGoing = PR_FALSE;
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
       if (NS_OK != rv) {
         return rv;
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
   }
   return NS_OK;
@@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
   PRInt32 n = aLine->ChildCount();
   while (--n >= 0) {
     FindFloatersIn(frame, floaters);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   aLine->mFloaters = floaters;
@@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
       while (nsnull != frame) {
         frame->SetParent(this);
         lastFrame = frame;
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
 
       // Join the line lists
@@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
   // Now create some lines for the new frames
   nsIFrame* prevFrame = lastFrame;
   for (nsIFrame* frame = aNewFrame; nsnull != frame;
-       frame->GetNextSibling(frame)) {
+       frame->GetNextSibling(&frame)) {
     // See if the child is a block or non-block
     const nsStyleDisplay* kidDisplay;
     rv = frame->GetStyleData(eStyleStruct_Display,
@@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
   nsIFrame* newFrame = aFrameList;
   while (nsnull != newFrame) {
     nsIFrame* next;
-    newFrame->GetNextSibling(next);
+    newFrame->GetNextSibling(&next);
     newFrame->SetNextSibling(nsnull);
 
     const nsStyleDisplay* display;
@@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
             for (i = 0; i < n; i++) {
               if (frame == aPrevSibling) {
                 nsIFrame* nextSibling;
-                aPrevSibling->GetNextSibling(nextSibling);
+                aPrevSibling->GetNextSibling(&nextSibling);
 
                 // Create new line to hold the remaining frames
                 NS_ASSERTION(n - i - 1 > 0, "bad line count");
@@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
                 line->mChildCount = i + 1;
                 break;
               }
-              frame->GetNextSibling(frame);
+              frame->GetNextSibling(&frame);
             }
 
             // 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
       // sibling list being in the "before insertion" state.
       nsIFrame* nextSibling;
-      aPrevSibling->GetNextSibling(nextSibling);
+      aPrevSibling->GetNextSibling(&nextSibling);
       newFrame->SetNextSibling(nextSibling);
       aPrevSibling->SetNextSibling(newFrame);
     }
@@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
         goto found_frame;
       }
       prevSibling = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     linep = &line->mNext;
     prevLine = line;
@@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
   NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
   if (nsnull != prevSibling) {
     nsIFrame* tmp;
-    prevSibling->GetNextSibling(tmp);
+    prevSibling->GetNextSibling(&tmp);
     NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
   }
 #endif
@@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
 
       // Get the deleted frames next sibling
       nsIFrame* nextFrame;
-      aDeletedFrame->GetNextSibling(nextFrame);
+      aDeletedFrame->GetNextSibling(&nextFrame);
 
       // Remove aDeletedFrame from the line
       if (line->mFirstChild == aDeletedFrame) {
@@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
 
     NS_RELEASE(tc);
     NS_RELEASE(content);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return PR_TRUE;
 }
@@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
     PRInt32 n = line->ChildCount();
     while (--n >= 0) {
       nsIFrame* nextChild;
-      child->GetNextSibling(nextChild);
+      child->GetNextSibling(&nextChild);
       if (child == aChild) {
         NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
            ("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
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       break;
     }
@@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
           // We found a non-zero sized child frame that precedes aFrame
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
     }
   
@@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
       while (--n >= 0) {
         PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
                    aWhichLayer);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
     }
   }
@@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     aLines = aLines->mNext;
   }
@@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
   }
   return PR_FALSE;
@@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
           }
         }
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     block = (nsBlockFrame*) block->mNextInFlow;
   }
@@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
           // therefore it will end an open text run.
           ll.EndTextRun();
         }
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
     }
     else {
@@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
   while (nsnull != frame) {
     frame->SetParent(this);
     lastFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   // Join the line lists
@@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
       // Remove frame from line and mark the line dirty
       --line->mChildCount;
       line->MarkDirty();
-      firstChild->GetNextSibling(line->mFirstChild);
+      firstChild->GetNextSibling(&line->mFirstChild);
     }
 
     // Break linkage to next child after stolen frame
@@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
             done = PR_TRUE;
             break;
           }
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
         }
         if (done) {
           break;
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h
index ab2e8df0cf9..dad86068d63 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.h
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.h
@@ -123,7 +123,7 @@ VerifyLineLength(nsLineBox* aLine)
   nsIFrame* frame = aLine->mFirstChild;
   PRInt32 n = aLine->mChildCount;
   while (--n >= 0) {
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 }
 #endif
@@ -461,7 +461,7 @@ ReResolveLineList(nsIPresContext* aPresContext,
     PRInt32 n = aLine->mChildCount;
     while ((--n >= 0) && NS_SUCCEEDED(rv)) {
       rv = child->ReResolveStyleContext(aPresContext, aStyleContext);
-      child->GetNextSibling(child);
+      child->GetNextSibling(&child);
     }
     aLine = aLine->mNext;
   }
@@ -527,7 +527,7 @@ nsBlockFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
         else {
           rv = child->ReResolveStyleContext(aPresContext, mStyleContext);
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       line = line->mNext;
     }
@@ -631,7 +631,7 @@ nsBlockFrame::List(FILE* out, PRInt32 aIndent) const
       fputs("<\n", out);
       while (nsnull != kid) {
         kid->List(out, aIndent + 1);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       IndentBy(out, aIndent);
       fputs(">\n", out);
@@ -1518,7 +1518,7 @@ nsBlockFrame::ReflowDirtyLines(nsBlockReflowState& aState)
     while (--n >= 0) {
       frame->SetParent(this);
       lastFrame = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     lastFrame->SetNextSibling(nsnull);
 
@@ -1713,7 +1713,7 @@ nsBlockFrame::ReflowLine(nsBlockReflowState& aState,
         }
         break;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
 
     // Pull frames and reflow them until we can't
@@ -1835,7 +1835,7 @@ nsBlockFrame::PullFrame(nsBlockReflowState& aState,
     if (0 != --fromLine->mChildCount) {
       // Mark line dirty now that we pulled a child
       fromLine->MarkDirty();
-      frame->GetNextSibling(fromLine->mFirstChild);
+      frame->GetNextSibling(&fromLine->mFirstChild);
     }
     else {
       // 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);
     }
 
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   // 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)) {
         ihr->MoveInSpaceManager(aPresContext, aSpaceManager, aDeltaX, aDeltaY);
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
     
     line = line->mNext;
@@ -1989,7 +1989,7 @@ nsBlockFrame::FindFollowingBlockFrame(nsIFrame* aFrame)
   nsIFrame* frame = aFrame;
   for (;;) {
     nsIFrame* nextFrame;
-    frame->GetNextSibling(nextFrame);
+    frame->GetNextSibling(&nextFrame);
     if (nsnull != nextFrame) {
       const nsStyleDisplay* display;
       nextFrame->GetStyleData(eStyleStruct_Display,
@@ -2308,7 +2308,7 @@ nsBlockFrame::ReflowBlockFrame(nsBlockReflowState& aState,
         // Push continuation to a new line, but only if we actually
         // made one.
         if (madeContinuation) {
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
           nsLineBox* line = new nsLineBox(frame, 1, LINE_IS_BLOCK);
           if (nsnull == line) {
             return NS_ERROR_OUT_OF_MEMORY;
@@ -2468,7 +2468,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
       }
 
       // Split line, but after the frame just reflowed
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2501,7 +2501,7 @@ nsBlockFrame::ReflowInlineFrame(nsBlockReflowState& aState,
     if (needSplit) {
       // Split line after the current frame
       aKeepLineGoing = PR_FALSE;
-      aFrame->GetNextSibling(aFrame);
+      aFrame->GetNextSibling(&aFrame);
       rv = SplitLine(aState, aLine, aFrame);
       if (NS_FAILED(rv)) {
         return rv;
@@ -2892,7 +2892,7 @@ FindFloatersIn(nsIFrame* aFrame, nsVoidArray*& aArray)
       if (NS_OK != rv) {
         return rv;
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
   }
   return NS_OK;
@@ -2911,7 +2911,7 @@ nsBlockFrame::FindFloaters(nsLineBox* aLine)
   PRInt32 n = aLine->ChildCount();
   while (--n >= 0) {
     FindFloatersIn(frame, floaters);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   aLine->mFloaters = floaters;
@@ -2980,7 +2980,7 @@ nsBlockFrame::DrainOverflowLines()
       while (nsnull != frame) {
         frame->SetParent(this);
         lastFrame = frame;
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
 
       // Join the line lists
@@ -3097,7 +3097,7 @@ nsBlockFrame::AppendNewFrames(nsIPresContext& aPresContext,
   // Now create some lines for the new frames
   nsIFrame* prevFrame = lastFrame;
   for (nsIFrame* frame = aNewFrame; nsnull != frame;
-       frame->GetNextSibling(frame)) {
+       frame->GetNextSibling(&frame)) {
     // See if the child is a block or non-block
     const nsStyleDisplay* kidDisplay;
     rv = frame->GetStyleData(eStyleStruct_Display,
@@ -3239,7 +3239,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
   nsIFrame* newFrame = aFrameList;
   while (nsnull != newFrame) {
     nsIFrame* next;
-    newFrame->GetNextSibling(next);
+    newFrame->GetNextSibling(&next);
     newFrame->SetNextSibling(nsnull);
 
     const nsStyleDisplay* display;
@@ -3332,7 +3332,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
             for (i = 0; i < n; i++) {
               if (frame == aPrevSibling) {
                 nsIFrame* nextSibling;
-                aPrevSibling->GetNextSibling(nextSibling);
+                aPrevSibling->GetNextSibling(&nextSibling);
 
                 // Create new line to hold the remaining frames
                 NS_ASSERTION(n - i - 1 > 0, "bad line count");
@@ -3346,7 +3346,7 @@ nsBlockFrame::InsertNewFrames(nsIPresContext& aPresContext,
                 line->mChildCount = i + 1;
                 break;
               }
-              frame->GetNextSibling(frame);
+              frame->GetNextSibling(&frame);
             }
 
             // 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
       // sibling list being in the "before insertion" state.
       nsIFrame* nextSibling;
-      aPrevSibling->GetNextSibling(nextSibling);
+      aPrevSibling->GetNextSibling(&nextSibling);
       newFrame->SetNextSibling(nextSibling);
       aPrevSibling->SetNextSibling(newFrame);
     }
@@ -3431,7 +3431,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
         goto found_frame;
       }
       prevSibling = frame;
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     linep = &line->mNext;
     prevLine = line;
@@ -3442,7 +3442,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
   NS_ASSERTION(nsnull != line, "can't find deleted frame in lines");
   if (nsnull != prevSibling) {
     nsIFrame* tmp;
-    prevSibling->GetNextSibling(tmp);
+    prevSibling->GetNextSibling(&tmp);
     NS_ASSERTION(tmp == aDeletedFrame, "bad prevSibling");
   }
 #endif
@@ -3483,7 +3483,7 @@ nsBlockFrame::DoRemoveFrame(nsIPresContext& aPresContext,
 
       // Get the deleted frames next sibling
       nsIFrame* nextFrame;
-      aDeletedFrame->GetNextSibling(nextFrame);
+      aDeletedFrame->GetNextSibling(&nextFrame);
 
       // Remove aDeletedFrame from the line
       if (line->mFirstChild == aDeletedFrame) {
@@ -3619,7 +3619,7 @@ IsEmptyLine(nsIPresContext& aPresContext, nsLineBox* aLine)
 
     NS_RELEASE(tc);
     NS_RELEASE(content);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return PR_TRUE;
 }
@@ -3726,7 +3726,7 @@ nsBlockFrame::RemoveChild(nsLineBox* aLines, nsIFrame* aChild)
     PRInt32 n = line->ChildCount();
     while (--n >= 0) {
       nsIFrame* nextChild;
-      child->GetNextSibling(nextChild);
+      child->GetNextSibling(&nextChild);
       if (child == aChild) {
         NS_FRAME_TRACE(NS_FRAME_TRACE_CALLS,
            ("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
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
       break;
     }
@@ -3939,7 +3939,7 @@ nsBlockReflowState::IsLeftMostChild(nsIFrame* aFrame)
           // We found a non-zero sized child frame that precedes aFrame
           return PR_FALSE;
         }
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
     }
   
@@ -4238,7 +4238,7 @@ nsBlockFrame::PaintChildren(nsIPresContext& aPresContext,
       while (--n >= 0) {
         PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid,
                    aWhichLayer);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
     }
   }
@@ -4293,7 +4293,7 @@ InLineList(nsLineBox* aLines, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     aLines = aLines->mNext;
   }
@@ -4309,7 +4309,7 @@ InSiblingList(nsLineBox* aLine, nsIFrame* aFrame)
       if (frame == aFrame) {
         return PR_TRUE;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
   }
   return PR_FALSE;
@@ -4472,7 +4472,7 @@ nsBlockFrame::RenumberLists(nsBlockReflowState& aState)
           }
         }
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     block = (nsBlockFrame*) block->mNextInFlow;
   }
@@ -4596,7 +4596,7 @@ nsBlockFrame::ComputeTextRuns(nsBlockReflowState& aState)
           // therefore it will end an open text run.
           ll.EndTextRun();
         }
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
     }
     else {
@@ -4626,7 +4626,7 @@ nsBlockFrame::TakeRunInFrames(nsBlockFrame* aRunInFrame)
   while (nsnull != frame) {
     frame->SetParent(this);
     lastFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   // Join the line lists
@@ -4771,7 +4771,7 @@ nsAnonymousBlockFrame::RemoveFirstFrame()
       // Remove frame from line and mark the line dirty
       --line->mChildCount;
       line->MarkDirty();
-      firstChild->GetNextSibling(line->mFirstChild);
+      firstChild->GetNextSibling(&line->mFirstChild);
     }
 
     // Break linkage to next child after stolen frame
@@ -4818,7 +4818,7 @@ nsAnonymousBlockFrame::RemoveFramesFrom(nsIFrame* aFrame)
             done = PR_TRUE;
             break;
           }
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
         }
         if (done) {
           break;
diff --git a/mozilla/layout/html/base/src/nsContainerFrame.cpp b/mozilla/layout/html/base/src/nsContainerFrame.cpp
index 121f88141a1..2bcf0ed367c 100644
--- a/mozilla/layout/html/base/src/nsContainerFrame.cpp
+++ b/mozilla/layout/html/base/src/nsContainerFrame.cpp
@@ -102,7 +102,7 @@ nsContainerFrame::DidReflow(nsIPresContext& aPresContext,
         if (NS_SUCCEEDED(rv)) {
           htmlReflow->DidReflow(aPresContext, aStatus);
         }
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       NS_IF_RELEASE(listName);
       GetAdditionalChildListName(listIndex++, &listName);
@@ -148,14 +148,14 @@ nsContainerFrame::ReResolveStyleContext(nsIPresContext* aPresContext,
     result = FirstChild(nsnull, &child);
     while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
       result = child->ReResolveStyleContext(aPresContext, mStyleContext);
-      child->GetNextSibling(child);
+      child->GetNextSibling(&child);
     }
 
     // Update overflow list too
     child = mOverflowFrames.FirstChild();
     while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
       result = child->ReResolveStyleContext(aPresContext, mStyleContext);
-      child->GetNextSibling(child);
+      child->GetNextSibling(&child);
     }
 
     // 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();
       while ((NS_SUCCEEDED(result)) && (nsnull != child)) {
         result = child->ReResolveStyleContext(aPresContext, mStyleContext);
-        child->GetNextSibling(child);
+        child->GetNextSibling(&child);
       }
     }
   }
@@ -214,7 +214,7 @@ nsContainerFrame::PaintChildren(nsIPresContext&      aPresContext,
   nsIFrame* kid = mFrames.FirstChild();
   while (nsnull != kid) {
     PaintChild(aPresContext, aRenderingContext, aDirtyRect, kid, aWhichLayer);
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   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);
       return kid->GetFrameForPoint(tmp, aFrame);
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   FirstChild(aList, &kid);
@@ -326,7 +326,7 @@ nsContainerFrame::GetFrameForPointUsing(const nsPoint& aPoint,
         return NS_OK;
       }
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
   *aFrame = this;
   return NS_ERROR_FAILURE;
@@ -419,7 +419,7 @@ nsContainerFrame::DeleteChildsNextInFlow(nsIPresContext& aPresContext,
   // Take the next-in-flow out of the parent's child list
   if (parent->mFrames.FirstChild() == nextInFlow) {
     nsIFrame* nextFrame;
-    nextInFlow->GetNextSibling(nextFrame);
+    nextInFlow->GetNextSibling(&nextFrame);
     parent->mFrames.SetFrames(nextFrame);
   } else {
     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 not the last child in parent)
     NS_ASSERTION(((nsContainerFrame*)parent)->IsChild(aChild), "screwy flow");
-    aChild->GetNextSibling(nextSibling);
+    aChild->GetNextSibling(&nextSibling);
     NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling");
 
-    nextInFlow->GetNextSibling(nextSibling);
+    nextInFlow->GetNextSibling(&nextSibling);
     aChild->SetNextSibling(nextSibling);
   }
 
@@ -467,7 +467,7 @@ nsContainerFrame::PushChildren(nsIFrame* aFromChild, nsIFrame* aPrevSibling)
   NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child");
 #ifdef NS_DEBUG
   nsIFrame* prevNextSibling;
-  aPrevSibling->GetNextSibling(prevNextSibling);
+  aPrevSibling->GetNextSibling(&prevNextSibling);
   NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling");
 #endif
 
@@ -620,7 +620,7 @@ nsContainerFrame::List(FILE* out, PRInt32 aIndent) const
       fputs("<\n", out);
       while (nsnull != kid) {
         kid->List(out, aIndent + 1);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       IndentBy(out, aIndent);
       fputs(">\n", out);
diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp
index 3ce5555909b..9c467c04b09 100644
--- a/mozilla/layout/html/base/src/nsFrame.cpp
+++ b/mozilla/layout/html/base/src/nsFrame.cpp
@@ -1576,9 +1576,10 @@ NS_IMETHODIMP nsFrame::GetAutoMarginSize(PRUint8 aSide, nscoord& aSize) const
 
 // 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;
 }
 
@@ -1777,7 +1778,7 @@ nsFrame::DumpBaseRegressionData(FILE* out, PRInt32 aIndent)
       aIndent++;
       while (nsnull != kid) {
         kid->DumpRegressionData(out, aIndent);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
       aIndent--;
       IndentBy(out, aIndent);
@@ -1833,7 +1834,7 @@ nsFrame::SetSelectedContentOffsets(PRBool aSelected, PRInt32 aBeginContentOffset
                                                aForceRedraw , aTracker, aActualSelected);
     if (NS_SUCCEEDED(result) && aActualSelected)
       return result; //done.
-    result |= child->GetNextSibling(child);
+    result |= child->GetNextSibling(&child);
   }
   return result;
 }
@@ -1956,7 +1957,7 @@ static void RefreshAllContentFrames(nsIFrame * aFrame, nsIContent * aContent)
   aFrame->FirstChild(nsnull, &aFrame);
   while (aFrame) {
     RefreshAllContentFrames(aFrame, aContent);
-    aFrame->GetNextSibling(aFrame);
+    aFrame->GetNextSibling(&aFrame);
   }
 }
 
diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h
index 3ac91e4c654..158c2e2a641 100644
--- a/mozilla/layout/html/base/src/nsFrame.h
+++ b/mozilla/layout/html/base/src/nsFrame.h
@@ -194,7 +194,7 @@ public:
   NS_IMETHOD  GetFrameType(nsIAtom** aType) const;
   NS_IMETHOD  IsPercentageBase(PRBool& aBase) 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  IsTransparent(PRBool& aTransparent) const;
   NS_IMETHOD  Scrolled(nsIView *aView);
diff --git a/mozilla/layout/html/base/src/nsFrameList.cpp b/mozilla/layout/html/base/src/nsFrameList.cpp
index c7a1d37020f..00dfb5dd694 100644
--- a/mozilla/layout/html/base/src/nsFrameList.cpp
+++ b/mozilla/layout/html/base/src/nsFrameList.cpp
@@ -25,7 +25,7 @@ nsFrameList::DeleteFrames(nsIPresContext& aPresContext)
   nsIFrame* frame = mFirstChild;
   while (nsnull != frame) {
     nsIFrame* next;
-    frame->GetNextSibling(next);
+    frame->GetNextSibling(&next);
     frame->DeleteFrame(aPresContext);
     mFirstChild = frame = next;
   }
@@ -47,7 +47,7 @@ nsFrameList::AppendFrames(nsIFrame* aParent, nsIFrame* aFrameList)
       nsIFrame* frame = aFrameList;
       while (nsnull != frame) {
         frame->SetParent(aParent);
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
     }
   }
@@ -77,7 +77,7 @@ nsFrameList::RemoveFrame(nsIFrame* aFrame)
   NS_PRECONDITION(nsnull != aFrame, "null ptr");
   if (nsnull != aFrame) {
     nsIFrame* nextFrame;
-    aFrame->GetNextSibling(nextFrame);
+    aFrame->GetNextSibling(&nextFrame);
     aFrame->SetNextSibling(nsnull);
     if (aFrame == mFirstChild) {
       mFirstChild = nextFrame;
@@ -99,7 +99,7 @@ nsFrameList::RemoveFirstChild()
 {
   if (nsnull != mFirstChild) {
     nsIFrame* nextFrame;
-    mFirstChild->GetNextSibling(nextFrame);
+    mFirstChild->GetNextSibling(&nextFrame);
     mFirstChild->SetNextSibling(nsnull);
     mFirstChild = nextFrame;
     return PR_TRUE;
@@ -131,7 +131,7 @@ nsFrameList::InsertFrame(nsIFrame* aParent,
     }
     else {
       nsIFrame* nextFrame;
-      aPrevSibling->GetNextSibling(nextFrame);
+      aPrevSibling->GetNextSibling(&nextFrame);
       aPrevSibling->SetNextSibling(aNewFrame);
       aNewFrame->SetNextSibling(nextFrame);
     }
@@ -152,7 +152,7 @@ nsFrameList::InsertFrames(nsIFrame* aParent,
       nsIFrame* frame = aFrameList;
       while (nsnull != frame) {
         frame->SetParent(aParent);
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
     }
 
@@ -164,7 +164,7 @@ nsFrameList::InsertFrames(nsIFrame* aParent,
     }
     else {
       nsIFrame* nextFrame;
-      aPrevSibling->GetNextSibling(nextFrame);
+      aPrevSibling->GetNextSibling(&nextFrame);
       aPrevSibling->SetNextSibling(aFrameList);
       lastNewFrame->SetNextSibling(nextFrame);
     }
@@ -180,7 +180,7 @@ nsFrameList::ReplaceFrame(nsIFrame* aParent,
   NS_PRECONDITION(nsnull != aNewFrame, "null ptr");
   if ((nsnull != aOldFrame) && (nsnull != aNewFrame)) {
     nsIFrame* nextFrame;
-    aOldFrame->GetNextSibling(nextFrame);
+    aOldFrame->GetNextSibling(&nextFrame);
     if (aOldFrame == mFirstChild) {
       mFirstChild = aNewFrame;
       aNewFrame->SetNextSibling(nextFrame);
@@ -224,7 +224,7 @@ nsFrameList::Split(nsIFrame* aAfterFrame, nsIFrame** aNextFrameResult)
 
   if ((nsnull != aNextFrameResult) && (nsnull != aAfterFrame)) {
     nsIFrame* nextFrame;
-    aAfterFrame->GetNextSibling(nextFrame);
+    aAfterFrame->GetNextSibling(&nextFrame);
     aAfterFrame->SetNextSibling(nsnull);
     *aNextFrameResult = nextFrame;
     return PR_TRUE;
@@ -266,7 +266,7 @@ nsFrameList::LastChild() const
   nsIFrame* frame = mFirstChild;
   while (nsnull != frame) {
     nsIFrame* next;
-    frame->GetNextSibling(next);
+    frame->GetNextSibling(&next);
     if (nsnull == next) {
       break;
     }
@@ -282,7 +282,7 @@ nsFrameList::FrameAt(PRInt32 aIndex) const
   if (aIndex < 0) return nsnull;
   nsIFrame* frame = mFirstChild;
   while ((aIndex-- > 0) && (nsnull != frame)) {
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return frame;
 }
@@ -296,7 +296,7 @@ nsFrameList::ContainsFrame(const nsIFrame* aFrame) const
     if (frame == aFrame) {
       return PR_TRUE;
     }
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return PR_FALSE;
 }
@@ -308,7 +308,7 @@ nsFrameList::GetLength() const
   nsIFrame* frame = mFirstChild;
   while (nsnull != frame) {
     count++;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return count;
 }
@@ -323,7 +323,7 @@ nsFrameList::GetPrevSiblingFor(nsIFrame* aFrame) const
   nsIFrame* frame = mFirstChild;
   while (nsnull != frame) {
     nsIFrame* next;
-    frame->GetNextSibling(next);
+    frame->GetNextSibling(&next);
     if (next == aFrame) {
       break;
     }
@@ -341,7 +341,7 @@ nsFrameList::VerifyParent(nsIFrame* aParent) const
     nsIFrame* parent;
     frame->GetParent(&parent);
     NS_ASSERTION(parent == aParent, "bad parent");
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 #endif
 }
@@ -355,7 +355,7 @@ nsFrameList::List(FILE* out) const
     frame->List(out, 1);
 //    nsFrame::ListTag(out, frame);
 //    fputs(" ", out);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   fputs("\n", out);
 }
diff --git a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
index 93e6f02ff3f..f0aee09e3bb 100644
--- a/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
+++ b/mozilla/layout/html/base/src/nsHTMLContainerFrame.cpp
@@ -123,7 +123,7 @@ nsHTMLContainerFrame::MoveFrameOutOfFlow(nsIPresContext&        aPresContext,
 
     // Set aFrame's next sibling to nsnull, and remember the current next
     // sibling pointer
-    aFrame->GetNextSibling(nextSibling);
+    aFrame->GetNextSibling(&nextSibling);
     aFrame->SetNextSibling(nsnull);
 
     // 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
     // into our lines child list.
     nsIFrame* nextFrame;
-    aFrame->GetNextSibling(nextFrame);
+    aFrame->GetNextSibling(&nextFrame);
     nsIStyleContext* kidSC;
     aFrame->GetStyleContext(&kidSC);
     aFrame->CreateContinuingFrame(aPresContext, aOuterFrame,
diff --git a/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp
index c31f7720838..d3506bbb8be 100644
--- a/mozilla/layout/html/base/src/nsInlineFrame.cpp
+++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp
@@ -239,7 +239,7 @@ nsInlineFrame::SectionData::SectionData(nsIFrame* aFrameList)
       }
     }
     lastFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 }
 
@@ -264,7 +264,7 @@ nsInlineFrame::SectionData::SplitFrameList(nsFrameList& aSection1,
   if (lastFrame != lastBlock) {
     // There are inline frames that follow the last block. Setup section3.
     nsIFrame* remainder;
-    lastBlock->GetNextSibling(remainder);
+    lastBlock->GetNextSibling(&remainder);
     lastBlock->SetNextSibling(nsnull);
     aSection3.SetFrames(remainder);
   }
@@ -346,7 +346,7 @@ nsInlineFrame::MoveOutOfFlow(nsIPresContext& aPresContext,
       frame = placeholder;
     }
     prevFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return NS_OK;
 }
@@ -367,7 +367,7 @@ nsInlineFrame::FindPrevAnonymousBlock(nsInlineFrame** aBlockParent)
         *aBlockParent = prevInFlow;
         return (nsAnonymousBlockFrame*) frame;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     prevInFlow = (nsInlineFrame*) prevInFlow->mPrevInFlow;
   }
@@ -390,7 +390,7 @@ nsInlineFrame::FindAnonymousBlock(nsInlineFrame** aBlockParent)
         *aBlockParent = nextInFlow;
         return (nsAnonymousBlockFrame*) frame;
       }
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     nextInFlow = (nsInlineFrame*) nextInFlow->mNextInFlow;
   }
@@ -421,7 +421,7 @@ nsInlineFrame::CreateAnonymousBlock(nsIPresContext& aPresContext,
       nsIFrame* frame = aInitialFrames;
       while (nsnull != frame) {
         frame->SetParent(bf);
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
       rv = bf->SetInitialChildList(aPresContext, nsnull, aInitialFrames);
     }
@@ -504,7 +504,7 @@ nsInlineFrame::AppendFrames(nsIPresContext& aPresContext,
       // this frame, stealing children from our continuation frames as
       // necessary.
       nsIFrame* inlineSiblings;
-      anonymousBlock->GetNextSibling(inlineSiblings);
+      anonymousBlock->GetNextSibling(&inlineSiblings);
       nsFrameList newBlockFrames;
       if (nsnull != inlineSiblings) {
         newBlockFrames.AppendFrames(anonymousBlock, inlineSiblings);
@@ -715,7 +715,7 @@ nsInlineFrame::InsertBlockFrames(nsIPresContext& aPresContext,
       nsIFrame* frame = aFrameList;
       while (nsnull != frame) {
         frame->SetParent(prevFrameParent);
-        frame->GetNextSibling(frame);
+        frame->GetNextSibling(&frame);
       }
       nsAnonymousBlockFrame* anonymousBlock;
       anonymousBlock = (nsAnonymousBlockFrame*) prevFrameParent;
@@ -872,7 +872,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
       // frames into the anonymous block if they should be in
       // section3.
       nsIFrame* nextSibling;
-      aPrevFrame->GetNextSibling(nextSibling);
+      aPrevFrame->GetNextSibling(&nextSibling);
       nsIFrame* anonymousBlockNextInFlow;
       prevFrameParent->GetNextInFlow(anonymousBlockNextInFlow);
       if ((nsnull != nextSibling) || (nsnull != anonymousBlockNextInFlow)) {
@@ -881,7 +881,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
         nsIFrame* frame = aFrameList;
         while (nsnull != frame) {
           frame->SetParent(anonymousBlock);
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
         }
         anonymousBlock->InsertFrames2(aPresContext, aPresShell, nsnull,
                                       aPrevFrame, aFrameList);
@@ -899,7 +899,7 @@ nsInlineFrame::InsertInlineFrames(nsIPresContext& aPresContext,
         nsIFrame* frame = aFrameList;
         while (nsnull != frame) {
           frame->SetParent(anonymousBlockParent);
-          frame->GetNextSibling(frame);
+          frame->GetNextSibling(&frame);
         }
         anonymousBlockParent->mFrames.InsertFrames(nsnull, anonymousBlock,
                                                    aFrameList);
@@ -1001,7 +1001,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
           // last block in the anonymous block.
           anonymousBlock->GetNextInFlow(nextInFlow);
           nsIFrame* nextSib;
-          aOldFrame->GetNextSibling(nextSib);
+          aOldFrame->GetNextSibling(&nextSib);
           if ((nsnull != nextInFlow) || (nsnull != nextSib)) {
             // There is a block in the anonymous block after the block
             // that we are removing. This means that we can let the
@@ -1051,7 +1051,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
                 SectionData sd(kids);
                 if (sd.HasABlock()) {
                   kids = sd.lastBlock;
-                  kids->GetNextSibling(kids);
+                  kids->GetNextSibling(&kids);
                   if (nsnull != kids) {
                     // Take the frames that follow the last block
                     // (which are inline frames) and remove them from
@@ -1127,7 +1127,7 @@ nsInlineFrame::RemoveFrame(nsIPresContext& aPresContext,
                 break;
               }
               nsIFrame* next;
-              kid->GetNextSibling(next);
+              kid->GetNextSibling(&next);
               anonymousBlock->RemoveFirstFrame();
               frames.AppendFrame(nsnull, kid);
               kid = next;
@@ -1354,7 +1354,7 @@ nsInlineFrame::ReflowInlineFrames(ReflowState& rs,
       break;
     }
     rs.prevFrame = frame;
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   // Attempt to pull frames from our next-in-flow until we can't
@@ -1453,7 +1453,7 @@ nsInlineFrame::ReflowInlineFrame(ReflowState& rs,
         }
       }
       nsIFrame* nextFrame;
-      aFrame->GetNextSibling(nextFrame);
+      aFrame->GetNextSibling(&nextFrame);
       if (nsnull != nextFrame) {
         aStatus |= NS_FRAME_NOT_COMPLETE;
         PushFrames(nextFrame, aFrame);
@@ -1479,7 +1479,7 @@ nsInlineFrame::ReflowInlineFrame(ReflowState& rs,
       return rv;
     }
     nsIFrame* nextFrame;
-    aFrame->GetNextSibling(nextFrame);
+    aFrame->GetNextSibling(&nextFrame);
     if (nsnull != nextFrame) {
       PushFrames(nextFrame, aFrame);
     }
@@ -1559,7 +1559,7 @@ nsInlineFrame::PushFrames(nsIFrame* aFromChild, nsIFrame* aPrevSibling)
   NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child");
 #ifdef NS_DEBUG
   nsIFrame* prevNextSibling;
-  aPrevSibling->GetNextSibling(prevNextSibling);
+  aPrevSibling->GetNextSibling(&prevNextSibling);
   NS_PRECONDITION(prevNextSibling == aFromChild, "bad prev sibling");
 #endif
 
@@ -1637,7 +1637,7 @@ nsInlineFrame::ReflowBlockFrame(ReflowState& rs,
       // inline frames. Make sure we reflect that in our reflow status
       // and push them to our next-in-flow.
       nsIFrame* nextFrame;
-      blockFrame->GetNextSibling(nextFrame);
+      blockFrame->GetNextSibling(&nextFrame);
       if (nsnull != nextFrame) {
         PushFrames(nextFrame, blockFrame);
         aStatus |= NS_FRAME_NOT_COMPLETE;
diff --git a/mozilla/layout/html/base/src/nsInlineReflow.cpp b/mozilla/layout/html/base/src/nsInlineReflow.cpp
index 2db72ce29dd..37b84c14f3c 100644
--- a/mozilla/layout/html/base/src/nsInlineReflow.cpp
+++ b/mozilla/layout/html/base/src/nsInlineReflow.cpp
@@ -961,7 +961,7 @@ nsInlineReflow::HorizontalAlignFrames(nsRect& aLineBox, PRBool aAllowJustify)
         nsIFrame* kid = pfd->mFrame;;
         kid->GetOrigin(origin);
         kid->MoveTo(origin.x + dx, origin.y);
-        kid->GetNextSibling(kid);
+        kid->GetNextSibling(&kid);
       }
     }
   }
diff --git a/mozilla/layout/html/base/src/nsLineBox.cpp b/mozilla/layout/html/base/src/nsLineBox.cpp
index b5a56ec59a1..622474519b1 100644
--- a/mozilla/layout/html/base/src/nsLineBox.cpp
+++ b/mozilla/layout/html/base/src/nsLineBox.cpp
@@ -94,7 +94,7 @@ nsLineBox::List(FILE* out, PRInt32 aIndent) const
   PRInt32 n = ChildCount();
   while (--n >= 0) {
     frame->List(out, aIndent + 1);
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
 
   for (i = aIndent; --i >= 0; ) fputs("  ", out);
@@ -112,7 +112,7 @@ nsLineBox::LastChild() const
   nsIFrame* frame = mFirstChild;
   PRInt32 n = ChildCount() - 1;
   while (--n >= 0) {
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return frame;
 }
@@ -133,7 +133,7 @@ nsLineBox::Contains(nsIFrame* aFrame) const
     if (frame == aFrame) {
       return PR_TRUE;
     }
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   return PR_FALSE;
 }
@@ -223,7 +223,7 @@ nsLineBox::DeleteLineList(nsIPresContext& aPresContext, nsLineBox* aLine)
     // view.
     for (nsIFrame* child = aLine->mFirstChild; child; ) {
       nsIFrame* nextChild;
-      child->GetNextSibling(nextChild);
+      child->GetNextSibling(&nextChild);
       child->DeleteFrame(aPresContext);
       child = nextChild;
     }
diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp
index 90e08330551..b2f6dad6cae 100644
--- a/mozilla/layout/html/base/src/nsPresShell.cpp
+++ b/mozilla/layout/html/base/src/nsPresShell.cpp
@@ -1408,7 +1408,7 @@ FindFrameWithContent(nsIFrame* aFrame, nsIContent* aContent)
         NS_IF_RELEASE(listName);
         return result;
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
     NS_IF_RELEASE(listName);
     aFrame->GetAdditionalChildListName(listIndex++, &listName);
@@ -1732,8 +1732,8 @@ CompareTrees(nsIFrame* aA, nsIFrame* aB)
         CompareTrees(k1, k2);
 
         // Advance to next sibling
-        k1->GetNextSibling(k1);
-        k2->GetNextSibling(k2);
+        k1->GetNextSibling(&k1);
+        k2->GetNextSibling(&k2);
       }
       else {
         break;
diff --git a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
index 523401acfe3..67d4a46661c 100644
--- a/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
+++ b/mozilla/layout/html/base/src/nsSimplePageSequence.cpp
@@ -88,7 +88,7 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext&          aPresContext,
 
     // Compute the y-offset of this page
     for (nsIFrame* f = mFrames.FirstChild(); f != nextFrame;
-         f->GetNextSibling(f)) {
+         f->GetNextSibling(&f)) {
       nsSize  size;
 
       f->GetSize(size);
@@ -111,13 +111,13 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext&          aPresContext,
     // XXX Check if the page is complete...
 
     // Update the y-offset to reflect the remaining pages
-    nextFrame->GetNextSibling(nextFrame);
+    nextFrame->GetNextSibling(&nextFrame);
     while (nsnull != nextFrame) {
       nsSize  size;
 
       nextFrame->GetSize(size);
       y += size.height + PAGE_SPACING_TWIPS;
-      nextFrame->GetNextSibling(nextFrame);
+      nextFrame->GetNextSibling(&nextFrame);
     }
 
   } else {
@@ -163,14 +163,14 @@ nsSimplePageSequenceFrame::Reflow(nsIPresContext&          aPresContext,
         // Add it to our child list
 #ifdef NS_DEBUG
         nsIFrame* kidNextSibling;
-        kidFrame->GetNextSibling(kidNextSibling);
+        kidFrame->GetNextSibling(&kidNextSibling);
         NS_ASSERTION(nsnull == kidNextSibling, "unexpected sibling");
 #endif
         kidFrame->SetNextSibling(continuingPage);
       }
 
       // Get the next page
-      kidFrame->GetNextSibling(kidFrame);
+      kidFrame->GetNextSibling(&kidFrame);
     }
   }
 
@@ -276,7 +276,7 @@ nsSimplePageSequenceFrame::Print(nsIPresContext&         aPresContext,
 
   // Print each specified page
   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
     PRBool  printThisPage = PR_TRUE;
 
diff --git a/mozilla/layout/html/base/src/nsViewportFrame.cpp b/mozilla/layout/html/base/src/nsViewportFrame.cpp
index 903e1cfacb0..a7fb4def7f3 100644
--- a/mozilla/layout/html/base/src/nsViewportFrame.cpp
+++ b/mozilla/layout/html/base/src/nsViewportFrame.cpp
@@ -264,7 +264,7 @@ ViewportFrame::ReflowFixedFrames(nsIPresContext&          aPresContext,
   reflowState.computedHeight = height;
 
   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
     nsReflowStatus  kidStatus;
     ReflowFixedFrame(aPresContext, reflowState, kidFrame, PR_FALSE, kidStatus);
@@ -338,7 +338,7 @@ ViewportFrame::IncrementalReflow(nsIPresContext&          aPresContext,
 
       nsReflowStatus  status;
       ReflowFixedFrame(aPresContext, reflowState, newFrames, PR_TRUE, status);
-      newFrames->GetNextSibling(newFrames);
+      newFrames->GetNextSibling(&newFrames);
     }
   }
 
diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
index 1942d10a057..cfcc2bdc308 100644
--- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
+++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp
@@ -417,7 +417,7 @@ void nsHTMLFramesetFrame::GetSizeOfChild(nsIFrame* aChild,
   // this assumption is used here
   int i = 0;
   for (nsIFrame* child = mFrames.FirstChild(); child;
-       child->GetNextSibling(child)) {
+       child->GetNextSibling(&child)) {
     if (aChild == child) {
       nsPoint ignore;
       GetSizeOfChildAt(i, aSize, ignore);
@@ -1150,7 +1150,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext&          aPresContext,
     lastCol  = cellIndex.x;
     lastSize = size;
     offset.x += size.width;
-    child->GetNextSibling(child);
+    child->GetNextSibling(&child);
   }
 
   if (firstTime) {
diff --git a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
index f1b69f4a342..9a6f52e5087 100644
--- a/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFieldSetFrame.cpp
@@ -148,7 +148,7 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext& aPresContext,
     nsresult result = frame->QueryInterface(kLegendFrameCID, (void**)&legendFrame);
     if ((NS_OK == result) && legendFrame) {
       nsIFrame* nextFrame;
-      frame->GetNextSibling(nextFrame);
+      frame->GetNextSibling(&nextFrame);
       if (lastFrame) {
         lastFrame->SetNextSibling(nextFrame);
       } else {
@@ -161,7 +161,7 @@ nsFieldSetFrame::SetInitialChildList(nsIPresContext& aPresContext,
       frame = nextFrame;
      } else {
       frame->SetParent(mFrames.FirstChild());
-      frame->GetNextSibling(frame);
+      frame->GetNextSibling(&frame);
     }
     lastFrame = frame;
   }
diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp
index e1a84dd2fd1..fac6fde5854 100644
--- a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp
@@ -239,7 +239,7 @@ NS_IMETHODIMP nsFileControlFrame::Reflow(nsIPresContext&          aPresContext,
       maxSize.width  -= desiredSize.width;
       aDesiredSize.width  += desiredSize.width; 
       aDesiredSize.height = desiredSize.height;
-      childFrame->GetNextSibling(childFrame);
+      childFrame->GetNextSibling(&childFrame);
       offset.x += desiredSize.width + CONTROL_SPACING;
     }
   }
diff --git a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp
index 0f3c3c5d2df..ca6bed66638 100644
--- a/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsHTMLButtonControlFrame.cpp
@@ -553,7 +553,7 @@ nsHTMLButtonControlFrame::SetInitialChildList(nsIPresContext& aPresContext,
   NS_RELEASE(styleContext);                                           
 
   // 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());
   }
 
diff --git a/mozilla/layout/html/forms/src/nsLabelFrame.cpp b/mozilla/layout/html/forms/src/nsLabelFrame.cpp
index 29c7a8dfbbf..72cda4d2f88 100644
--- a/mozilla/layout/html/forms/src/nsLabelFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsLabelFrame.cpp
@@ -339,7 +339,7 @@ nsLabelFrame::FindFirstControl(nsIFrame* aParentFrame, nsIFormControlFrame*& aRe
     } else if (FindFirstControl(child, aResultFrame)) {
       return PR_TRUE;
     }
-    child->GetNextSibling(child);
+    child->GetNextSibling(&child);
   }
   return PR_FALSE;
 }
@@ -367,7 +367,7 @@ nsLabelFrame::SetInitialChildList(nsIPresContext& aPresContext,
   NS_RELEASE(styleContext);                                           
 
   // 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());
   }
 
diff --git a/mozilla/layout/html/forms/src/nsLegendFrame.cpp b/mozilla/layout/html/forms/src/nsLegendFrame.cpp
index f3d803e3196..66be43366ae 100644
--- a/mozilla/layout/html/forms/src/nsLegendFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsLegendFrame.cpp
@@ -101,7 +101,7 @@ nsLegendFrame::SetInitialChildList(nsIPresContext& aPresContext,
   NS_RELEASE(styleContext);                                           
 
   // 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());
   }
 
diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp
index f4f94a163b7..5ec616496ee 100644
--- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp
@@ -208,7 +208,7 @@ nsListControlFrame::GetFrameForPointUsing(const nsPoint& aPoint,
       //*aFrame = kid;
       //return NS_OK;
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 
   mContentFrame->FirstChild(aList, &kid);
@@ -222,7 +222,7 @@ nsListControlFrame::GetFrameForPointUsing(const nsPoint& aPoint,
         return NS_OK;
       }
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
   *aFrame = this;
   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, insideWidth, desiredLineSize.height);
       childFrame->SetRect(rect);
-      childFrame->GetNextSibling(childFrame);
+      childFrame->GetNextSibling(&childFrame);
       offset.x = 0;
       offset.y += desiredLineSize.height;
     }
@@ -378,7 +378,7 @@ nsListControlFrame::GetOptionFromChild(nsIFrame* aParentFrame)
     if (nsnull != frame) {
       return frame;
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
   return nsnull;
 }
@@ -438,7 +438,7 @@ PRInt32 nsListControlFrame::SetContentSelected(nsIFrame *    aHitFrame,
       aHitContent->SetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::kClass, (aIsSelected?kSelectedFocus:kNormal), PR_TRUE);
       return index;
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
     index++;
   }
   return -1;
@@ -460,7 +460,7 @@ void nsListControlFrame::ClearSelection()
       }
     }
     NS_RELEASE(content);
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
     i++;
   }
 }
@@ -503,7 +503,7 @@ void nsListControlFrame::ExtendedSelection(PRInt32 aStartIndex, PRInt32 aEndInde
       startInverting = PR_FALSE;
     }
     NS_RELEASE(content);
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
     i++;
   }
 }
@@ -1046,7 +1046,7 @@ nsListControlFrame::AboutToDropDown()
       return NS_OK;
     }
     NS_RELEASE(content);
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
     i++;
   }
   return NS_OK;
@@ -1096,7 +1096,7 @@ nsListControlFrame::InitializeFromContent(PRBool aDoDisplay)
       NS_RELEASE(option);
     }
     NS_RELEASE(content);
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
     i++;
   }
 
diff --git a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp
index 960e1d48026..e748b1d1fd0 100644
--- a/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableColGroupFrame.cpp
@@ -53,7 +53,7 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
   if ((NS_SUCCEEDED(rv)) && (nsnull!=tableFrame))
   {
     // 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
       PRInt32 colIndex = mStartColIndex + mColCount;
       ((nsTableColFrame *)(kidFrame))->InitColFrame (colIndex);
@@ -173,7 +173,7 @@ NS_METHOD nsTableColGroupFrame::Reflow(nsIPresContext&          aPresContext,
   }
 
   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
     nsHTMLReflowMetrics kidSize(nsnull);
     // 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
 
   nsIFrame *childFrame=nsnull;
-  GetNextSibling(childFrame);
+  GetNextSibling(&childFrame);
   while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame))
   {
     const nsStyleDisplay *display;
@@ -337,7 +337,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColInserted(nsIPresContext&          aPresCon
     {
       startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
     }
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   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
 
   nsIFrame *childFrame=nsnull;
-  GetNextSibling(childFrame);
+  GetNextSibling(&childFrame);
   while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame))
   {
     const nsStyleDisplay *display;
@@ -374,7 +374,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColAppended(nsIPresContext&          aPresCon
     {
       startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
     }
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   // today we need to rebuild the whole column cache
@@ -405,7 +405,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColRemoved(nsIPresContext&          aPresCont
     if (childFrame==aDeletedFrame)
     {
       nsIFrame *deleteFrameNextSib=nsnull;
-      aDeletedFrame->GetNextSibling(deleteFrameNextSib);
+      aDeletedFrame->GetNextSibling(&deleteFrameNextSib);
       if (nsnull!=prevSib)
         prevSib->SetNextSibling(deleteFrameNextSib);
       else
@@ -420,7 +420,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColRemoved(nsIPresContext&          aPresCont
       startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
     }
     prevSib=childFrame;
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   // today we need to rebuild the whole column cache
@@ -536,7 +536,7 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext& aPre
           colStyleContext->RecalcAutomaticData(&aPresContext);
           colIndex++;
         }
-        colFrame->GetNextSibling(colFrame);
+        colFrame->GetNextSibling(&colFrame);
       }
     }
     else
@@ -566,7 +566,7 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext& aPre
               colStyleContext->RecalcAutomaticData(&aPresContext);
             }
           }
-          colFrame->GetNextSibling(colFrame);
+          colFrame->GetNextSibling(&colFrame);
         }
       }
     }
@@ -594,7 +594,7 @@ int nsTableColGroupFrame::GetColumnCount ()
       col->SetColumnIndex (mStartColIndex + mColCount);
       mColCount += col->GetSpan();
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   if (0==mColCount)
   { // 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;
       break;
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   return result;
 }
@@ -647,7 +647,7 @@ nsTableColFrame * nsTableColGroupFrame::GetColumnAt (PRInt32 aColIndex)
       if (aColIndex<=count)
         result = col;
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   return result;
 }
diff --git a/mozilla/layout/html/table/src/nsTableFrame.cpp b/mozilla/layout/html/table/src/nsTableFrame.cpp
index 340f590fc2c..c9e999ce19d 100644
--- a/mozilla/layout/html/table/src/nsTableFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableFrame.cpp
@@ -362,7 +362,7 @@ nsTableFrame::SetInitialChildList(nsIPresContext& aPresContext,
       prevMainChild = childFrame;
     }
     nsIFrame *prevChild = childFrame;
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
     prevChild->SetNextSibling(nsnull);
   }
   if (nsnull!=prevMainChild)
@@ -381,7 +381,7 @@ NS_IMETHODIMP nsTableFrame::DidAppendRowGroup(nsTableRowGroupFrame *aRowGroupFra
   nsresult rv=NS_OK;
   nsIFrame *nextRow=nsnull;
   aRowGroupFrame->FirstChild(nsnull, &nextRow);
-  for ( ; nsnull!=nextRow; nextRow->GetNextSibling(nextRow))
+  for ( ; nsnull!=nextRow; nextRow->GetNextSibling(&nextRow))
   {
     const nsStyleDisplay *rowDisplay;
     nextRow->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
@@ -406,7 +406,7 @@ PRInt32 nsTableFrame::GetSpecifiedColumnCount ()
   while (nsnull!=childFrame)
   {
     mColCount += ((nsTableColGroupFrame *)childFrame)->GetColumnCount();
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }    
   if (PR_TRUE==gsDebug) printf("TIF GetSpecifiedColumnCount: returning %d\n", mColCount);
   return mColCount;
@@ -677,7 +677,7 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
         break;
       }
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
 
   // count the number of column frames we already have
@@ -691,7 +691,7 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
     actualColumns += numCols;
     lastColGroupFrame = (nsTableColGroupFrame *)childFrame;
     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
@@ -915,7 +915,7 @@ NS_METHOD nsTableFrame::ReBuildCellMap()
   if (PR_TRUE==gsDebugIR) printf("TIF: ReBuildCellMap.\n");
   nsresult rv=NS_OK;
   nsIFrame *rowGroupFrame=mFrames.FirstChild();
-  for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(rowGroupFrame))
+  for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(&rowGroupFrame))
   {
     const nsStyleDisplay *rowGroupDisplay;
     rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay);
@@ -923,7 +923,7 @@ NS_METHOD nsTableFrame::ReBuildCellMap()
     {
       nsIFrame *rowFrame;
       rowGroupFrame->FirstChild(nsnull, &rowFrame);
-      for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(rowFrame))
+      for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(&rowFrame))
       {
         const nsStyleDisplay *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
     nsIFrame* kidFrame;
 
-    aKidFrame->GetNextSibling(kidFrame);
+    aKidFrame->GetNextSibling(&kidFrame);
     while (nsnull != kidFrame) {
       nsPoint        origin;
       nsIHTMLReflow* htmlReflow;
@@ -2297,7 +2297,7 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext&        aPresCon
 
       // Get the next frame
       lastKidFrame = kidFrame;
-      kidFrame->GetNextSibling(kidFrame);
+      kidFrame->GetNextSibling(&kidFrame);
     }
 
   } else {
@@ -2498,7 +2498,7 @@ NS_METHOD nsTableFrame::ResizeReflowPass1(nsIPresContext&          aPresContext,
     nsIFrame* kidFrame = aStartingFrame;
     if (nsnull==kidFrame)
       kidFrame=mFrames.FirstChild();   
-    for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) 
+    for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) 
     {
       const nsStyleDisplay *childDisplay;
       kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay));
@@ -2553,7 +2553,7 @@ NS_METHOD nsTableFrame::ResizeReflowPass1(nsIPresContext&          aPresContext,
     if (PR_TRUE==aDoSiblingFrames)
     {
       kidFrame=mColGroups.FirstChild();   
-      for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) 
+      for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) 
       {
         nsSize maxKidElementSize(0,0);
         nsHTMLReflowState kidReflowState(aPresContext, kidFrame, aReflowState,
@@ -2818,7 +2818,7 @@ NS_METHOD nsTableFrame::IR_ColGroupInserted(nsIPresContext&        aPresContext,
     if ((nsnull!=frameToInsertAfter) && (childFrame==frameToInsertAfter))
     {
       nsIFrame *nextSib=nsnull;
-      frameToInsertAfter->GetNextSibling(nextSib);
+      frameToInsertAfter->GetNextSibling(&nextSib);
       aInsertedFrame->SetNextSibling(nextSib);
       frameToInsertAfter->SetNextSibling(aInsertedFrame);
       // 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
       startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
     prevSib=childFrame;
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   InvalidateColumnCache();
@@ -2860,7 +2860,7 @@ NS_METHOD nsTableFrame::IR_ColGroupAppended(nsIPresContext&        aPresContext,
   {
     startingColIndex += ((nsTableColGroupFrame *)childFrame)->GetColumnCount();
     lastChild=childFrame;
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   // append aAppendedFrame
@@ -2941,7 +2941,7 @@ NS_METHOD nsTableFrame::IR_ColGroupRemoved(nsIPresContext&        aPresContext,
     if (childFrame==aDeletedFrame)
     {
       nsIFrame *deleteFrameNextSib=nsnull;
-      aDeletedFrame->GetNextSibling(deleteFrameNextSib);
+      aDeletedFrame->GetNextSibling(&deleteFrameNextSib);
       if (nsnull!=prevSib)
         prevSib->SetNextSibling(deleteFrameNextSib);
       else
@@ -2961,7 +2961,7 @@ NS_METHOD nsTableFrame::IR_ColGroupRemoved(nsIPresContext&        aPresContext,
         startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
     }
     prevSib=childFrame;
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   InvalidateColumnCache();
@@ -3326,7 +3326,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
           // Add the continuing frame to the sibling list
           nsIFrame* nextSib;
            
-          kidFrame->GetNextSibling(nextSib);
+          kidFrame->GetNextSibling(&nextSib);
           continuingFrame->SetNextSibling(nextSib);
           kidFrame->SetNextSibling(continuingFrame);
         }
@@ -3334,7 +3334,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
         // children to the next-in-flow
         nsIFrame* nextSibling;
          
-        kidFrame->GetNextSibling(nextSibling);
+        kidFrame->GetNextSibling(&nextSibling);
         if (nsnull != nextSibling) {
           PushChildren(nextSibling, kidFrame);
         }
@@ -3352,7 +3352,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
     }
 
     // Get the next child
-    kidFrame->GetNextSibling(kidFrame);
+    kidFrame->GetNextSibling(&kidFrame);
 
     // XXX talk with troy about checking for available space here
   }
@@ -3716,10 +3716,10 @@ nscoord nsTableFrame::ComputeDesiredHeight(nsIPresContext& aPresContext,
               rowFrame->GetRect(rowRect);
               sumOfRowHeights += rowRect.height;
             }
-            rowFrame->GetNextSibling(rowFrame);
+            rowFrame->GetNextSibling(&rowFrame);
           }
         }
-        rowGroupFrame->GetNextSibling(rowGroupFrame);
+        rowGroupFrame->GetNextSibling(&rowGroupFrame);
       }
       rowGroupFrame=mFrames.FirstChild();
       nscoord y=0;
@@ -3760,14 +3760,14 @@ nscoord nsTableFrame::ComputeDesiredHeight(nsIPresContext& aPresContext,
               y += excessForRow+rowRect.height;
               excessForRowGroup += excessForRow;
             }
-            rowFrame->GetNextSibling(rowFrame);
+            rowFrame->GetNextSibling(&rowFrame);
           }
           nsRect rowGroupRect;
           rowGroupFrame->GetRect(rowGroupRect);
           nsRect newRowGroupRect(rowGroupRect.x, rowGroupRect.y, rowGroupRect.width, excessForRowGroup+rowGroupRect.height);
           rowGroupFrame->SetRect(newRowGroupRect);
         }
-        rowGroupFrame->GetNextSibling(rowGroupFrame);
+        rowGroupFrame->GetNextSibling(&rowGroupFrame);
       }
     }
   }
@@ -3942,7 +3942,7 @@ NS_METHOD nsTableFrame::GetColumnFrame(PRInt32 aColIndex, nsTableColFrame *&aCol
           break;
         }
       }
-      childFrame->GetNextSibling(childFrame);
+      childFrame->GetNextSibling(&childFrame);
     }
   }
   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));
               if (NS_STYLE_DISPLAY_TABLE_CELL == cellDisplay->mDisplay)
                 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
@@ -4046,9 +4046,9 @@ void nsTableFrame::BuildColumnCache( nsIPresContext&          aPresContext,
           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");
   mColumnCacheValid=PR_TRUE;
@@ -4076,9 +4076,9 @@ void nsTableFrame::CacheColFramesInCellMap()
         }
         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;
   // reset the state in each row
   nsIFrame *rowGroupFrame=mFrames.FirstChild();
-  for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(rowGroupFrame))
+  for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(&rowGroupFrame))
   {
     const nsStyleDisplay *rowGroupDisplay;
     rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay);
@@ -4149,7 +4149,7 @@ void nsTableFrame::InvalidateCellMap()
     {
       nsIFrame *rowFrame;
       rowGroupFrame->FirstChild(nsnull, &rowFrame);
-      for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(rowFrame))
+      for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(&rowFrame))
       {
         const nsStyleDisplay *rowDisplay;
         rowFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
@@ -4221,7 +4221,7 @@ nsTableFrame::CreateContinuingFrame(nsIPresContext&  aPresContext,
     }
     NS_RELEASE(content);                                                 // content: REFCNT--
     // get the next row group
-    rg->GetNextSibling(rg);
+    rg->GetNextSibling(&rg);
   }
   aContinuingFrame = cf;
   return NS_OK;
diff --git a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
index e775e15c7d3..5b43a3279e5 100644
--- a/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableOuterFrame.cpp
@@ -106,7 +106,7 @@ NS_IMETHODIMP nsTableOuterFrame::SetInitialChildList(nsIPresContext& aPresContex
   //XXX this should go through the child list looking for a displaytype==caption
   if (1 < mFrames.GetLength()) {
     nsIFrame *child;
-    nsresult result = aChildList->GetNextSibling(child);
+    nsresult result = aChildList->GetNextSibling(&child);
     while ((NS_SUCCEEDED(result)) && (nsnull!=child)) 
     {
       const nsStyleDisplay* childDisplay;
@@ -116,7 +116,7 @@ NS_IMETHODIMP nsTableOuterFrame::SetInitialChildList(nsIPresContext& aPresContex
         mCaptionFrame = child;
         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
   if (parent->mFrames.FirstChild() == nextInFlow) {
     nsIFrame* nextSibling;
-    nextInFlow->GetNextSibling(nextSibling);
+    nextInFlow->GetNextSibling(&nextSibling);
     parent->mFrames.SetFrames(nextSibling);
 
   } 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 not the last child in parent)
     NS_ASSERTION(parent->IsChild(aChild), "screwy flow");
-    aChild->GetNextSibling(nextSibling);
+    aChild->GetNextSibling(&nextSibling);
     NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling");
 
-    nextInFlow->GetNextSibling(nextSibling);
+    nextInFlow->GetNextSibling(&nextSibling);
     aChild->SetNextSibling(nextSibling);
   }
 
diff --git a/mozilla/layout/html/table/src/nsTableRowFrame.cpp b/mozilla/layout/html/table/src/nsTableRowFrame.cpp
index 2d8668918a3..5ef4c598207 100644
--- a/mozilla/layout/html/table/src/nsTableRowFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableRowFrame.cpp
@@ -124,7 +124,7 @@ nsTableRowFrame::InitChildren(PRInt32 aRowIndex)
       SetRowIndex(rowIndex);
       if (gsDebug) printf("Row InitChildren: set row index to %d\n", rowIndex);
       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;
         kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
@@ -233,7 +233,7 @@ nsTableRowFrame::DidResize(nsIPresContext& aPresContext,
       }
     }
       // Get the next cell
-    cellFrame->GetNextSibling(cellFrame);
+    cellFrame->GetNextSibling(&cellFrame);
   }
 
   // Let our base class do the usual work
@@ -329,7 +329,7 @@ void nsTableRowFrame::PaintChildren(nsIPresContext&      aPresContext,
         aRenderingContext.PopState(clipState);
       }
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 }
 
@@ -361,7 +361,7 @@ PRInt32 nsTableRowFrame::GetMaxColumns() const
     {
       sum += ((nsTableCellFrame *)cell)->GetColSpan();
     }
-    cell->GetNextSibling(cell);
+    cell->GetNextSibling(&cell);
   }
   return sum;
 }
@@ -385,7 +385,7 @@ void nsTableRowFrame::GetMinRowSpan(nsTableFrame *aTableFrame)
       else if (minRowSpan>rowSpan)
         minRowSpan = rowSpan;
     }
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   mMinRowSpan = minRowSpan;
 }
@@ -408,7 +408,7 @@ void nsTableRowFrame::FixMinCellHeight(nsTableFrame *aTableFrame)
           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");
 
   nsIFrame *result=nsnull;
-  aCurrentChild->GetNextSibling(result);
+  aCurrentChild->GetNextSibling(&result);
   return result;
 }
 
@@ -747,7 +747,7 @@ nsTableRowFrame::InitialReflow(nsIPresContext&      aPresContext,
   else
     kidFrame = aStartFrame;
 
-  for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) 
+  for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) 
   {
     const nsStyleDisplay *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
@@ -1466,7 +1466,7 @@ nsTableRowFrame::CreateContinuingFrame(nsIPresContext&  aPresContext,
   nsIFrame* newChildList;
   for (nsIFrame* kidFrame = mFrames.FirstChild();
        nsnull != kidFrame;
-       kidFrame->GetNextSibling(kidFrame)) {
+       kidFrame->GetNextSibling(&kidFrame)) {
 
     const nsStyleDisplay *kidDisplay;
     kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
@@ -1517,7 +1517,7 @@ PRBool nsTableRowFrame::Contains(const nsPoint& aPoint)
         result = PR_TRUE;
         break;
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
   }
   return result;
diff --git a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp
index 376ef4dc4eb..b1185b488af 100644
--- a/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp
+++ b/mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp
@@ -120,7 +120,7 @@ NS_METHOD nsTableRowGroupFrame::GetRowCount(PRInt32 &aCount)
     childFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay));
     if (NS_STYLE_DISPLAY_TABLE_ROW == childDisplay->mDisplay)
       aCount++;
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   return NS_OK;
 }
@@ -140,7 +140,7 @@ PRInt32 nsTableRowGroupFrame::GetStartRowIndex()
       result = ((nsTableRowFrame *)childFrame)->GetRowIndex();
       break;
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   return result;
 }
@@ -161,7 +161,7 @@ NS_METHOD nsTableRowGroupFrame::GetMaxColumns(PRInt32 &aMaxColumns) const
       PRInt32 colCount = ((nsTableRowFrame *)childFrame)->GetMaxColumns();
       aMaxColumns = PR_MAX(aMaxColumns, colCount);
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   return NS_OK;
 }
@@ -239,7 +239,7 @@ void nsTableRowGroupFrame::PaintChildren(nsIPresContext&      aPresContext,
       }
       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);
       }
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
   *aFrame = this;
   return NS_ERROR_FAILURE;
@@ -484,7 +484,7 @@ NS_METHOD nsTableRowGroupFrame::ReflowMappedChildren(nsIPresContext&      aPresC
       break;
 
     // Get the next child
-    kidFrame->GetNextSibling(kidFrame);
+    kidFrame->GetNextSibling(&kidFrame);
   }
 
   return rv;
@@ -661,7 +661,7 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
       rowIndex++;
     }
     // Get the next row
-    rowFrame->GetNextSibling(rowFrame);
+    rowFrame->GetNextSibling(&rowFrame);
     }
 
   /* Step 2:  Now account for cells that span rows.
@@ -777,21 +777,21 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
                                          i, rowFrameToBeResized, rowRect.y + delta, delta);
                   }
                   // Get the next row frame
-                  rowFrameToBeResized->GetNextSibling((nsIFrame*&)rowFrameToBeResized);
+                  rowFrameToBeResized->GetNextSibling((nsIFrame**)&rowFrameToBeResized);
                 }
                 delete []excessForRow;
               }
             }
           }
           // Get the next row child (cell frame)
-          cellFrame->GetNextSibling(cellFrame);
+          cellFrame->GetNextSibling(&cellFrame);
         }
         // Update the running row group height
         rowGroupHeight += rowHeights[rowIndex];
         rowIndex++;
       }
       // 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);
     }
     // Get the next row
-    rowFrame->GetNextSibling(rowFrame);
+    rowFrame->GetNextSibling(&rowFrame);
   }
 
   // Adjust our desired size
@@ -828,7 +828,7 @@ nsresult nsTableRowGroupFrame::AdjustSiblingsAfterReflow(nsIPresContext&      aP
     // Move the frames that follow aKidFrame by aDeltaY
     nsIFrame* kidFrame;
 
-    aKidFrame->GetNextSibling(kidFrame);
+    aKidFrame->GetNextSibling(&kidFrame);
     while (nsnull != kidFrame) {
       nsPoint origin;
   
@@ -845,7 +845,7 @@ nsresult nsTableRowGroupFrame::AdjustSiblingsAfterReflow(nsIPresContext&      aP
 
       // Get the next frame
       lastKidFrame = kidFrame;
-      kidFrame->GetNextSibling(kidFrame);
+      kidFrame->GetNextSibling(&kidFrame);
     }
 
   } else {
@@ -874,7 +874,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext&          aPresContext,
 
   // Walk each of the row frames looking for the first row frame that
   // 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;
 
     kidFrame->GetRect(bounds);
@@ -908,7 +908,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext&          aPresContext,
           // Add it to the child list
           nsIFrame* nextSibling;
   
-          kidFrame->GetNextSibling(nextSibling);
+          kidFrame->GetNextSibling(&nextSibling);
           continuingFrame->SetNextSibling(nextSibling);
           kidFrame->SetNextSibling(continuingFrame);
   
@@ -1219,7 +1219,7 @@ PRBool nsTableRowGroupFrame::NoRowsFollow()
 {
   PRBool result = PR_TRUE;
   nsIFrame *nextSib=nsnull;
-  GetNextSibling(nextSib);
+  GetNextSibling(&nextSib);
   while (nsnull!=nextSib)
   {
     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);
   return result;
diff --git a/mozilla/layout/tables/nsTableColGroupFrame.cpp b/mozilla/layout/tables/nsTableColGroupFrame.cpp
index 960e1d48026..e748b1d1fd0 100644
--- a/mozilla/layout/tables/nsTableColGroupFrame.cpp
+++ b/mozilla/layout/tables/nsTableColGroupFrame.cpp
@@ -53,7 +53,7 @@ nsTableColGroupFrame::InitNewFrames(nsIPresContext& aPresContext, nsIFrame* aChi
   if ((NS_SUCCEEDED(rv)) && (nsnull!=tableFrame))
   {
     // 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
       PRInt32 colIndex = mStartColIndex + mColCount;
       ((nsTableColFrame *)(kidFrame))->InitColFrame (colIndex);
@@ -173,7 +173,7 @@ NS_METHOD nsTableColGroupFrame::Reflow(nsIPresContext&          aPresContext,
   }
 
   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
     nsHTMLReflowMetrics kidSize(nsnull);
     // 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
 
   nsIFrame *childFrame=nsnull;
-  GetNextSibling(childFrame);
+  GetNextSibling(&childFrame);
   while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame))
   {
     const nsStyleDisplay *display;
@@ -337,7 +337,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColInserted(nsIPresContext&          aPresCon
     {
       startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
     }
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   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
 
   nsIFrame *childFrame=nsnull;
-  GetNextSibling(childFrame);
+  GetNextSibling(&childFrame);
   while ((NS_SUCCEEDED(rv)) && (nsnull!=childFrame))
   {
     const nsStyleDisplay *display;
@@ -374,7 +374,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColAppended(nsIPresContext&          aPresCon
     {
       startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
     }
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   // today we need to rebuild the whole column cache
@@ -405,7 +405,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColRemoved(nsIPresContext&          aPresCont
     if (childFrame==aDeletedFrame)
     {
       nsIFrame *deleteFrameNextSib=nsnull;
-      aDeletedFrame->GetNextSibling(deleteFrameNextSib);
+      aDeletedFrame->GetNextSibling(&deleteFrameNextSib);
       if (nsnull!=prevSib)
         prevSib->SetNextSibling(deleteFrameNextSib);
       else
@@ -420,7 +420,7 @@ NS_METHOD nsTableColGroupFrame::IR_ColRemoved(nsIPresContext&          aPresCont
       startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
     }
     prevSib=childFrame;
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   // today we need to rebuild the whole column cache
@@ -536,7 +536,7 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext& aPre
           colStyleContext->RecalcAutomaticData(&aPresContext);
           colIndex++;
         }
-        colFrame->GetNextSibling(colFrame);
+        colFrame->GetNextSibling(&colFrame);
       }
     }
     else
@@ -566,7 +566,7 @@ NS_METHOD nsTableColGroupFrame::SetStyleContextForFirstPass(nsIPresContext& aPre
               colStyleContext->RecalcAutomaticData(&aPresContext);
             }
           }
-          colFrame->GetNextSibling(colFrame);
+          colFrame->GetNextSibling(&colFrame);
         }
       }
     }
@@ -594,7 +594,7 @@ int nsTableColGroupFrame::GetColumnCount ()
       col->SetColumnIndex (mStartColIndex + mColCount);
       mColCount += col->GetSpan();
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   if (0==mColCount)
   { // 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;
       break;
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   return result;
 }
@@ -647,7 +647,7 @@ nsTableColFrame * nsTableColGroupFrame::GetColumnAt (PRInt32 aColIndex)
       if (aColIndex<=count)
         result = col;
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   return result;
 }
diff --git a/mozilla/layout/tables/nsTableFrame.cpp b/mozilla/layout/tables/nsTableFrame.cpp
index 340f590fc2c..c9e999ce19d 100644
--- a/mozilla/layout/tables/nsTableFrame.cpp
+++ b/mozilla/layout/tables/nsTableFrame.cpp
@@ -362,7 +362,7 @@ nsTableFrame::SetInitialChildList(nsIPresContext& aPresContext,
       prevMainChild = childFrame;
     }
     nsIFrame *prevChild = childFrame;
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
     prevChild->SetNextSibling(nsnull);
   }
   if (nsnull!=prevMainChild)
@@ -381,7 +381,7 @@ NS_IMETHODIMP nsTableFrame::DidAppendRowGroup(nsTableRowGroupFrame *aRowGroupFra
   nsresult rv=NS_OK;
   nsIFrame *nextRow=nsnull;
   aRowGroupFrame->FirstChild(nsnull, &nextRow);
-  for ( ; nsnull!=nextRow; nextRow->GetNextSibling(nextRow))
+  for ( ; nsnull!=nextRow; nextRow->GetNextSibling(&nextRow))
   {
     const nsStyleDisplay *rowDisplay;
     nextRow->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
@@ -406,7 +406,7 @@ PRInt32 nsTableFrame::GetSpecifiedColumnCount ()
   while (nsnull!=childFrame)
   {
     mColCount += ((nsTableColGroupFrame *)childFrame)->GetColumnCount();
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }    
   if (PR_TRUE==gsDebug) printf("TIF GetSpecifiedColumnCount: returning %d\n", mColCount);
   return mColCount;
@@ -677,7 +677,7 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
         break;
       }
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
 
   // count the number of column frames we already have
@@ -691,7 +691,7 @@ void nsTableFrame::EnsureColumns(nsIPresContext& aPresContext)
     actualColumns += numCols;
     lastColGroupFrame = (nsTableColGroupFrame *)childFrame;
     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
@@ -915,7 +915,7 @@ NS_METHOD nsTableFrame::ReBuildCellMap()
   if (PR_TRUE==gsDebugIR) printf("TIF: ReBuildCellMap.\n");
   nsresult rv=NS_OK;
   nsIFrame *rowGroupFrame=mFrames.FirstChild();
-  for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(rowGroupFrame))
+  for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(&rowGroupFrame))
   {
     const nsStyleDisplay *rowGroupDisplay;
     rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay);
@@ -923,7 +923,7 @@ NS_METHOD nsTableFrame::ReBuildCellMap()
     {
       nsIFrame *rowFrame;
       rowGroupFrame->FirstChild(nsnull, &rowFrame);
-      for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(rowFrame))
+      for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(&rowFrame))
       {
         const nsStyleDisplay *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
     nsIFrame* kidFrame;
 
-    aKidFrame->GetNextSibling(kidFrame);
+    aKidFrame->GetNextSibling(&kidFrame);
     while (nsnull != kidFrame) {
       nsPoint        origin;
       nsIHTMLReflow* htmlReflow;
@@ -2297,7 +2297,7 @@ nsresult nsTableFrame::AdjustSiblingsAfterReflow(nsIPresContext&        aPresCon
 
       // Get the next frame
       lastKidFrame = kidFrame;
-      kidFrame->GetNextSibling(kidFrame);
+      kidFrame->GetNextSibling(&kidFrame);
     }
 
   } else {
@@ -2498,7 +2498,7 @@ NS_METHOD nsTableFrame::ResizeReflowPass1(nsIPresContext&          aPresContext,
     nsIFrame* kidFrame = aStartingFrame;
     if (nsnull==kidFrame)
       kidFrame=mFrames.FirstChild();   
-    for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) 
+    for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) 
     {
       const nsStyleDisplay *childDisplay;
       kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay));
@@ -2553,7 +2553,7 @@ NS_METHOD nsTableFrame::ResizeReflowPass1(nsIPresContext&          aPresContext,
     if (PR_TRUE==aDoSiblingFrames)
     {
       kidFrame=mColGroups.FirstChild();   
-      for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) 
+      for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) 
       {
         nsSize maxKidElementSize(0,0);
         nsHTMLReflowState kidReflowState(aPresContext, kidFrame, aReflowState,
@@ -2818,7 +2818,7 @@ NS_METHOD nsTableFrame::IR_ColGroupInserted(nsIPresContext&        aPresContext,
     if ((nsnull!=frameToInsertAfter) && (childFrame==frameToInsertAfter))
     {
       nsIFrame *nextSib=nsnull;
-      frameToInsertAfter->GetNextSibling(nextSib);
+      frameToInsertAfter->GetNextSibling(&nextSib);
       aInsertedFrame->SetNextSibling(nextSib);
       frameToInsertAfter->SetNextSibling(aInsertedFrame);
       // 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
       startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
     prevSib=childFrame;
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   InvalidateColumnCache();
@@ -2860,7 +2860,7 @@ NS_METHOD nsTableFrame::IR_ColGroupAppended(nsIPresContext&        aPresContext,
   {
     startingColIndex += ((nsTableColGroupFrame *)childFrame)->GetColumnCount();
     lastChild=childFrame;
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   // append aAppendedFrame
@@ -2941,7 +2941,7 @@ NS_METHOD nsTableFrame::IR_ColGroupRemoved(nsIPresContext&        aPresContext,
     if (childFrame==aDeletedFrame)
     {
       nsIFrame *deleteFrameNextSib=nsnull;
-      aDeletedFrame->GetNextSibling(deleteFrameNextSib);
+      aDeletedFrame->GetNextSibling(&deleteFrameNextSib);
       if (nsnull!=prevSib)
         prevSib->SetNextSibling(deleteFrameNextSib);
       else
@@ -2961,7 +2961,7 @@ NS_METHOD nsTableFrame::IR_ColGroupRemoved(nsIPresContext&        aPresContext,
         startingColIndex += ((nsTableColGroupFrame *)childFrame)->SetStartColumnIndex(startingColIndex);
     }
     prevSib=childFrame;
-    rv = childFrame->GetNextSibling(childFrame);
+    rv = childFrame->GetNextSibling(&childFrame);
   }
 
   InvalidateColumnCache();
@@ -3326,7 +3326,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
           // Add the continuing frame to the sibling list
           nsIFrame* nextSib;
            
-          kidFrame->GetNextSibling(nextSib);
+          kidFrame->GetNextSibling(&nextSib);
           continuingFrame->SetNextSibling(nextSib);
           kidFrame->SetNextSibling(continuingFrame);
         }
@@ -3334,7 +3334,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
         // children to the next-in-flow
         nsIFrame* nextSibling;
          
-        kidFrame->GetNextSibling(nextSibling);
+        kidFrame->GetNextSibling(&nextSibling);
         if (nsnull != nextSibling) {
           PushChildren(nextSibling, kidFrame);
         }
@@ -3352,7 +3352,7 @@ NS_METHOD nsTableFrame::ReflowMappedChildren(nsIPresContext& aPresContext,
     }
 
     // Get the next child
-    kidFrame->GetNextSibling(kidFrame);
+    kidFrame->GetNextSibling(&kidFrame);
 
     // XXX talk with troy about checking for available space here
   }
@@ -3716,10 +3716,10 @@ nscoord nsTableFrame::ComputeDesiredHeight(nsIPresContext& aPresContext,
               rowFrame->GetRect(rowRect);
               sumOfRowHeights += rowRect.height;
             }
-            rowFrame->GetNextSibling(rowFrame);
+            rowFrame->GetNextSibling(&rowFrame);
           }
         }
-        rowGroupFrame->GetNextSibling(rowGroupFrame);
+        rowGroupFrame->GetNextSibling(&rowGroupFrame);
       }
       rowGroupFrame=mFrames.FirstChild();
       nscoord y=0;
@@ -3760,14 +3760,14 @@ nscoord nsTableFrame::ComputeDesiredHeight(nsIPresContext& aPresContext,
               y += excessForRow+rowRect.height;
               excessForRowGroup += excessForRow;
             }
-            rowFrame->GetNextSibling(rowFrame);
+            rowFrame->GetNextSibling(&rowFrame);
           }
           nsRect rowGroupRect;
           rowGroupFrame->GetRect(rowGroupRect);
           nsRect newRowGroupRect(rowGroupRect.x, rowGroupRect.y, rowGroupRect.width, excessForRowGroup+rowGroupRect.height);
           rowGroupFrame->SetRect(newRowGroupRect);
         }
-        rowGroupFrame->GetNextSibling(rowGroupFrame);
+        rowGroupFrame->GetNextSibling(&rowGroupFrame);
       }
     }
   }
@@ -3942,7 +3942,7 @@ NS_METHOD nsTableFrame::GetColumnFrame(PRInt32 aColIndex, nsTableColFrame *&aCol
           break;
         }
       }
-      childFrame->GetNextSibling(childFrame);
+      childFrame->GetNextSibling(&childFrame);
     }
   }
   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));
               if (NS_STYLE_DISPLAY_TABLE_CELL == cellDisplay->mDisplay)
                 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
@@ -4046,9 +4046,9 @@ void nsTableFrame::BuildColumnCache( nsIPresContext&          aPresContext,
           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");
   mColumnCacheValid=PR_TRUE;
@@ -4076,9 +4076,9 @@ void nsTableFrame::CacheColFramesInCellMap()
         }
         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;
   // reset the state in each row
   nsIFrame *rowGroupFrame=mFrames.FirstChild();
-  for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(rowGroupFrame))
+  for ( ; nsnull!=rowGroupFrame; rowGroupFrame->GetNextSibling(&rowGroupFrame))
   {
     const nsStyleDisplay *rowGroupDisplay;
     rowGroupFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowGroupDisplay);
@@ -4149,7 +4149,7 @@ void nsTableFrame::InvalidateCellMap()
     {
       nsIFrame *rowFrame;
       rowGroupFrame->FirstChild(nsnull, &rowFrame);
-      for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(rowFrame))
+      for ( ; nsnull!=rowFrame; rowFrame->GetNextSibling(&rowFrame))
       {
         const nsStyleDisplay *rowDisplay;
         rowFrame->GetStyleData(eStyleStruct_Display, (const nsStyleStruct *&)rowDisplay);
@@ -4221,7 +4221,7 @@ nsTableFrame::CreateContinuingFrame(nsIPresContext&  aPresContext,
     }
     NS_RELEASE(content);                                                 // content: REFCNT--
     // get the next row group
-    rg->GetNextSibling(rg);
+    rg->GetNextSibling(&rg);
   }
   aContinuingFrame = cf;
   return NS_OK;
diff --git a/mozilla/layout/tables/nsTableOuterFrame.cpp b/mozilla/layout/tables/nsTableOuterFrame.cpp
index e775e15c7d3..5b43a3279e5 100644
--- a/mozilla/layout/tables/nsTableOuterFrame.cpp
+++ b/mozilla/layout/tables/nsTableOuterFrame.cpp
@@ -106,7 +106,7 @@ NS_IMETHODIMP nsTableOuterFrame::SetInitialChildList(nsIPresContext& aPresContex
   //XXX this should go through the child list looking for a displaytype==caption
   if (1 < mFrames.GetLength()) {
     nsIFrame *child;
-    nsresult result = aChildList->GetNextSibling(child);
+    nsresult result = aChildList->GetNextSibling(&child);
     while ((NS_SUCCEEDED(result)) && (nsnull!=child)) 
     {
       const nsStyleDisplay* childDisplay;
@@ -116,7 +116,7 @@ NS_IMETHODIMP nsTableOuterFrame::SetInitialChildList(nsIPresContext& aPresContex
         mCaptionFrame = child;
         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
   if (parent->mFrames.FirstChild() == nextInFlow) {
     nsIFrame* nextSibling;
-    nextInFlow->GetNextSibling(nextSibling);
+    nextInFlow->GetNextSibling(&nextSibling);
     parent->mFrames.SetFrames(nextSibling);
 
   } 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 not the last child in parent)
     NS_ASSERTION(parent->IsChild(aChild), "screwy flow");
-    aChild->GetNextSibling(nextSibling);
+    aChild->GetNextSibling(&nextSibling);
     NS_ASSERTION(nextSibling == nextInFlow, "unexpected sibling");
 
-    nextInFlow->GetNextSibling(nextSibling);
+    nextInFlow->GetNextSibling(&nextSibling);
     aChild->SetNextSibling(nextSibling);
   }
 
diff --git a/mozilla/layout/tables/nsTableRowFrame.cpp b/mozilla/layout/tables/nsTableRowFrame.cpp
index 2d8668918a3..5ef4c598207 100644
--- a/mozilla/layout/tables/nsTableRowFrame.cpp
+++ b/mozilla/layout/tables/nsTableRowFrame.cpp
@@ -124,7 +124,7 @@ nsTableRowFrame::InitChildren(PRInt32 aRowIndex)
       SetRowIndex(rowIndex);
       if (gsDebug) printf("Row InitChildren: set row index to %d\n", rowIndex);
       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;
         kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
@@ -233,7 +233,7 @@ nsTableRowFrame::DidResize(nsIPresContext& aPresContext,
       }
     }
       // Get the next cell
-    cellFrame->GetNextSibling(cellFrame);
+    cellFrame->GetNextSibling(&cellFrame);
   }
 
   // Let our base class do the usual work
@@ -329,7 +329,7 @@ void nsTableRowFrame::PaintChildren(nsIPresContext&      aPresContext,
         aRenderingContext.PopState(clipState);
       }
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
 }
 
@@ -361,7 +361,7 @@ PRInt32 nsTableRowFrame::GetMaxColumns() const
     {
       sum += ((nsTableCellFrame *)cell)->GetColSpan();
     }
-    cell->GetNextSibling(cell);
+    cell->GetNextSibling(&cell);
   }
   return sum;
 }
@@ -385,7 +385,7 @@ void nsTableRowFrame::GetMinRowSpan(nsTableFrame *aTableFrame)
       else if (minRowSpan>rowSpan)
         minRowSpan = rowSpan;
     }
-    frame->GetNextSibling(frame);
+    frame->GetNextSibling(&frame);
   }
   mMinRowSpan = minRowSpan;
 }
@@ -408,7 +408,7 @@ void nsTableRowFrame::FixMinCellHeight(nsTableFrame *aTableFrame)
           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");
 
   nsIFrame *result=nsnull;
-  aCurrentChild->GetNextSibling(result);
+  aCurrentChild->GetNextSibling(&result);
   return result;
 }
 
@@ -747,7 +747,7 @@ nsTableRowFrame::InitialReflow(nsIPresContext&      aPresContext,
   else
     kidFrame = aStartFrame;
 
-  for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) 
+  for ( ; nsnull != kidFrame; kidFrame->GetNextSibling(&kidFrame)) 
   {
     const nsStyleDisplay *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
@@ -1466,7 +1466,7 @@ nsTableRowFrame::CreateContinuingFrame(nsIPresContext&  aPresContext,
   nsIFrame* newChildList;
   for (nsIFrame* kidFrame = mFrames.FirstChild();
        nsnull != kidFrame;
-       kidFrame->GetNextSibling(kidFrame)) {
+       kidFrame->GetNextSibling(&kidFrame)) {
 
     const nsStyleDisplay *kidDisplay;
     kidFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)kidDisplay));
@@ -1517,7 +1517,7 @@ PRBool nsTableRowFrame::Contains(const nsPoint& aPoint)
         result = PR_TRUE;
         break;
       }
-      kid->GetNextSibling(kid);
+      kid->GetNextSibling(&kid);
     }
   }
   return result;
diff --git a/mozilla/layout/tables/nsTableRowGroupFrame.cpp b/mozilla/layout/tables/nsTableRowGroupFrame.cpp
index 376ef4dc4eb..b1185b488af 100644
--- a/mozilla/layout/tables/nsTableRowGroupFrame.cpp
+++ b/mozilla/layout/tables/nsTableRowGroupFrame.cpp
@@ -120,7 +120,7 @@ NS_METHOD nsTableRowGroupFrame::GetRowCount(PRInt32 &aCount)
     childFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)childDisplay));
     if (NS_STYLE_DISPLAY_TABLE_ROW == childDisplay->mDisplay)
       aCount++;
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   return NS_OK;
 }
@@ -140,7 +140,7 @@ PRInt32 nsTableRowGroupFrame::GetStartRowIndex()
       result = ((nsTableRowFrame *)childFrame)->GetRowIndex();
       break;
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   return result;
 }
@@ -161,7 +161,7 @@ NS_METHOD nsTableRowGroupFrame::GetMaxColumns(PRInt32 &aMaxColumns) const
       PRInt32 colCount = ((nsTableRowFrame *)childFrame)->GetMaxColumns();
       aMaxColumns = PR_MAX(aMaxColumns, colCount);
     }
-    childFrame->GetNextSibling(childFrame);
+    childFrame->GetNextSibling(&childFrame);
   }
   return NS_OK;
 }
@@ -239,7 +239,7 @@ void nsTableRowGroupFrame::PaintChildren(nsIPresContext&      aPresContext,
       }
       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);
       }
     }
-    kid->GetNextSibling(kid);
+    kid->GetNextSibling(&kid);
   }
   *aFrame = this;
   return NS_ERROR_FAILURE;
@@ -484,7 +484,7 @@ NS_METHOD nsTableRowGroupFrame::ReflowMappedChildren(nsIPresContext&      aPresC
       break;
 
     // Get the next child
-    kidFrame->GetNextSibling(kidFrame);
+    kidFrame->GetNextSibling(&kidFrame);
   }
 
   return rv;
@@ -661,7 +661,7 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
       rowIndex++;
     }
     // Get the next row
-    rowFrame->GetNextSibling(rowFrame);
+    rowFrame->GetNextSibling(&rowFrame);
     }
 
   /* Step 2:  Now account for cells that span rows.
@@ -777,21 +777,21 @@ void nsTableRowGroupFrame::CalculateRowHeights(nsIPresContext& aPresContext,
                                          i, rowFrameToBeResized, rowRect.y + delta, delta);
                   }
                   // Get the next row frame
-                  rowFrameToBeResized->GetNextSibling((nsIFrame*&)rowFrameToBeResized);
+                  rowFrameToBeResized->GetNextSibling((nsIFrame**)&rowFrameToBeResized);
                 }
                 delete []excessForRow;
               }
             }
           }
           // Get the next row child (cell frame)
-          cellFrame->GetNextSibling(cellFrame);
+          cellFrame->GetNextSibling(&cellFrame);
         }
         // Update the running row group height
         rowGroupHeight += rowHeights[rowIndex];
         rowIndex++;
       }
       // 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);
     }
     // Get the next row
-    rowFrame->GetNextSibling(rowFrame);
+    rowFrame->GetNextSibling(&rowFrame);
   }
 
   // Adjust our desired size
@@ -828,7 +828,7 @@ nsresult nsTableRowGroupFrame::AdjustSiblingsAfterReflow(nsIPresContext&      aP
     // Move the frames that follow aKidFrame by aDeltaY
     nsIFrame* kidFrame;
 
-    aKidFrame->GetNextSibling(kidFrame);
+    aKidFrame->GetNextSibling(&kidFrame);
     while (nsnull != kidFrame) {
       nsPoint origin;
   
@@ -845,7 +845,7 @@ nsresult nsTableRowGroupFrame::AdjustSiblingsAfterReflow(nsIPresContext&      aP
 
       // Get the next frame
       lastKidFrame = kidFrame;
-      kidFrame->GetNextSibling(kidFrame);
+      kidFrame->GetNextSibling(&kidFrame);
     }
 
   } else {
@@ -874,7 +874,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext&          aPresContext,
 
   // Walk each of the row frames looking for the first row frame that
   // 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;
 
     kidFrame->GetRect(bounds);
@@ -908,7 +908,7 @@ nsTableRowGroupFrame::SplitRowGroup(nsIPresContext&          aPresContext,
           // Add it to the child list
           nsIFrame* nextSibling;
   
-          kidFrame->GetNextSibling(nextSibling);
+          kidFrame->GetNextSibling(&nextSibling);
           continuingFrame->SetNextSibling(nextSibling);
           kidFrame->SetNextSibling(continuingFrame);
   
@@ -1219,7 +1219,7 @@ PRBool nsTableRowGroupFrame::NoRowsFollow()
 {
   PRBool result = PR_TRUE;
   nsIFrame *nextSib=nsnull;
-  GetNextSibling(nextSib);
+  GetNextSibling(&nextSib);
   while (nsnull!=nextSib)
   {
     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);
   return result;
diff --git a/mozilla/layout/xul/base/src/nsToolboxFrame.cpp b/mozilla/layout/xul/base/src/nsToolboxFrame.cpp
index ad4395f43e3..0792f03bfed 100644
--- a/mozilla/layout/xul/base/src/nsToolboxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsToolboxFrame.cpp
@@ -353,7 +353,7 @@ nsToolboxFrame :: Reflow(nsIPresContext&          aPresContext,
     
     // advance to the next child frame, if appropriate, and advance child content
     if ( canAdvanceFrame )
-      childFrame->GetNextSibling(childFrame);
+      childFrame->GetNextSibling(&childFrame);
     ++contentCounter;
     toolboxContent->ChildAt(contentCounter, *getter_AddRefs(childContent));
     ++grippyIndex;