diff --git a/layout/base/src/nsContainerFrame.cpp b/layout/base/src/nsContainerFrame.cpp
index 5a6c8abc3797..6748b30140e1 100644
--- a/layout/base/src/nsContainerFrame.cpp
+++ b/layout/base/src/nsContainerFrame.cpp
@@ -438,23 +438,15 @@ void nsContainerFrame::WillDeleteNextInFlowFrame(nsIFrame* aNextInFlow)
* the frames are placed on the overflow list (and the geometric parent is
* left unchanged).
*
- * Updates the next-in-flow's child count and content offsets. Does
- * not update the pusher's child count or last content offset.
+ * Updates the next-in-flow's child count. Does not update the
+ * pusher's child count.
*
* @param aFromChild the first child frame to push. It is disconnected from
* aPrevSibling
* @param aPrevSibling aFromChild's previous sibling. Must not be null. It's
* an error to push a parent's first child frame
- * @param aNextInFlowsLastChildIsComplete the next-in-flow's
- * mLastContentIsComplete flag. This is used when refilling an
- * empty next-in-flow that was drained by the caller.
- *
*/
-// Note: we cannot VerifyLastIsComplete here because the caller is
-// responsible for setting it.
-void nsContainerFrame::PushChildren(nsIFrame* aFromChild,
- nsIFrame* aPrevSibling,
- PRBool aNextInFlowsLastContentIsComplete)
+void nsContainerFrame::PushChildren(nsIFrame* aFromChild, nsIFrame* aPrevSibling)
{
NS_PRECONDITION(nsnull != aFromChild, "null pointer");
NS_PRECONDITION(nsnull != aPrevSibling, "pushing first child");
@@ -477,15 +469,6 @@ void nsContainerFrame::PushChildren(nsIFrame* aFromChild,
#ifdef NOISY
ListTag(stdout);
printf(": pushing kids (childCount=%d)\n", mChildCount);
- {
- nsContainerFrame* flow = (nsContainerFrame*) mNextInFlow;
- while (flow != 0) {
- printf(" %p: [%d,%d,%c]\n",
- flow, flow->mFirstContentOffset, flow->mLastContentOffset,
- (flow->mLastContentIsComplete ? 'T' : 'F'));
- flow = (nsContainerFrame*) flow->mNextInFlow;
- }
- }
#endif
// Compute the number of children being pushed, and for each child change
// its geometric parent. Remember the last child
@@ -516,15 +499,6 @@ void nsContainerFrame::PushChildren(nsIFrame* aFromChild,
#ifdef NOISY
ListTag(stdout);
printf(": push kids done (childCount=%d)\n", mChildCount);
- {
- nsContainerFrame* flow = (nsContainerFrame*) mNextInFlow;
- while (flow != 0) {
- printf(" %p: [%d,%d,%c]\n",
- flow, flow->mFirstContentOffset, flow->mLastContentOffset,
- (flow->mLastContentIsComplete ? 'T' : 'F'));
- flow = (nsContainerFrame*) flow->mNextInFlow;
- }
- }
#endif
} else {
// Add the frames to our overflow list
diff --git a/layout/base/src/nsContainerFrame.h b/layout/base/src/nsContainerFrame.h
index 190c5f8b1b79..0c282450601c 100644
--- a/layout/base/src/nsContainerFrame.h
+++ b/layout/base/src/nsContainerFrame.h
@@ -219,19 +219,15 @@ protected:
* the frames are placed on the overflow list (and the geometric parent is
* left unchanged).
*
- * Updates the next-in-flow's child count and content offsets. Does
- * not update the pusher's child count or last content offset.
+ * Updates the next-in-flow's child count. Does not update the
+ * pusher's child count.
*
* @param aFromChild the first child frame to push. It is disconnected from
* aPrevSibling
* @param aPrevSibling aFromChild's previous sibling. Must not be null. It's
* an error to push a parent's first child frame
- * @param aNextInFlowsLastChildIsComplete the next-in-flow's
- * mLastContentIsComplete flag. This is used when refilling an
- * empty next-in-flow that was drained by the caller.
*/
- void PushChildren(nsIFrame* aFromChild, nsIFrame* aPrevSibling,
- PRBool aNextInFlowsLastChildIsComplete);
+ void PushChildren(nsIFrame* aFromChild, nsIFrame* aPrevSibling);
/**
* Append child list starting at aChild to this frame's child list. Used for
diff --git a/layout/html/table/src/nsTableFrame.cpp b/layout/html/table/src/nsTableFrame.cpp
index c02d593dae5e..5b58f74a329d 100644
--- a/layout/html/table/src/nsTableFrame.cpp
+++ b/layout/html/table/src/nsTableFrame.cpp
@@ -1989,7 +1989,7 @@ PRBool nsTableFrame::ReflowMappedChildren( nsIPresContext* aPresContext,
{
// The child is too wide to fit in the available space, and it's
// not our first child
- PushChildren(kidFrame, prevKidFrame, PR_TRUE);
+ PushChildren(kidFrame, prevKidFrame);
result = PR_FALSE;
break;
}
@@ -2048,7 +2048,7 @@ PRBool nsTableFrame::ReflowMappedChildren( nsIPresContext* aPresContext,
kidFrame->GetNextSibling(nextSibling);
if (nsnull != nextSibling) {
- PushChildren(nextSibling, kidFrame, PR_TRUE);
+ PushChildren(nextSibling, kidFrame);
}
result = PR_FALSE;
break;
@@ -2195,7 +2195,7 @@ PRBool nsTableFrame::PullUpChildren(nsIPresContext* aPresContext,
// we pass PR_TRUE into PushChidren
kidFrame->SetNextSibling(continuingFrame);
- PushChildren(continuingFrame, kidFrame, PR_TRUE);
+ PushChildren(continuingFrame, kidFrame);
}
// If the child isn't complete then it means that we've used up
diff --git a/layout/html/table/src/nsTableRowGroupFrame.cpp b/layout/html/table/src/nsTableRowGroupFrame.cpp
index bab80f1637e8..fa44b36b6acf 100644
--- a/layout/html/table/src/nsTableRowGroupFrame.cpp
+++ b/layout/html/table/src/nsTableRowGroupFrame.cpp
@@ -318,7 +318,7 @@ PRBool nsTableRowGroupFrame::ReflowMappedChildren( nsIPresContext* aPresCon
//
// Note that if the width is too big that's okay and we allow the
// child to extend horizontally outside of the reflow area
- PushChildren(kidFrame, prevKidFrame, PR_TRUE);
+ PushChildren(kidFrame, prevKidFrame);
result = PR_FALSE;
break;
}
@@ -371,7 +371,7 @@ PRBool nsTableRowGroupFrame::ReflowMappedChildren( nsIPresContext* aPresCon
kidFrame->GetNextSibling(nextSibling);
if (nsnull != nextSibling) {
- PushChildren(nextSibling, kidFrame, PR_TRUE);
+ PushChildren(nextSibling, kidFrame);
}
result = PR_FALSE;
break;
@@ -513,7 +513,7 @@ PRBool nsTableRowGroupFrame::PullUpChildren(nsIPresContext* aPresContext,
// we pass PR_TRUE into PushChidren
kidFrame->SetNextSibling(continuingFrame);
- PushChildren(continuingFrame, kidFrame, PR_TRUE);
+ PushChildren(continuingFrame, kidFrame);
}
// If the child isn't complete then it means that we've used up
diff --git a/layout/tables/nsTableFrame.cpp b/layout/tables/nsTableFrame.cpp
index c02d593dae5e..5b58f74a329d 100644
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -1989,7 +1989,7 @@ PRBool nsTableFrame::ReflowMappedChildren( nsIPresContext* aPresContext,
{
// The child is too wide to fit in the available space, and it's
// not our first child
- PushChildren(kidFrame, prevKidFrame, PR_TRUE);
+ PushChildren(kidFrame, prevKidFrame);
result = PR_FALSE;
break;
}
@@ -2048,7 +2048,7 @@ PRBool nsTableFrame::ReflowMappedChildren( nsIPresContext* aPresContext,
kidFrame->GetNextSibling(nextSibling);
if (nsnull != nextSibling) {
- PushChildren(nextSibling, kidFrame, PR_TRUE);
+ PushChildren(nextSibling, kidFrame);
}
result = PR_FALSE;
break;
@@ -2195,7 +2195,7 @@ PRBool nsTableFrame::PullUpChildren(nsIPresContext* aPresContext,
// we pass PR_TRUE into PushChidren
kidFrame->SetNextSibling(continuingFrame);
- PushChildren(continuingFrame, kidFrame, PR_TRUE);
+ PushChildren(continuingFrame, kidFrame);
}
// If the child isn't complete then it means that we've used up
diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp
index bab80f1637e8..fa44b36b6acf 100644
--- a/layout/tables/nsTableRowGroupFrame.cpp
+++ b/layout/tables/nsTableRowGroupFrame.cpp
@@ -318,7 +318,7 @@ PRBool nsTableRowGroupFrame::ReflowMappedChildren( nsIPresContext* aPresCon
//
// Note that if the width is too big that's okay and we allow the
// child to extend horizontally outside of the reflow area
- PushChildren(kidFrame, prevKidFrame, PR_TRUE);
+ PushChildren(kidFrame, prevKidFrame);
result = PR_FALSE;
break;
}
@@ -371,7 +371,7 @@ PRBool nsTableRowGroupFrame::ReflowMappedChildren( nsIPresContext* aPresCon
kidFrame->GetNextSibling(nextSibling);
if (nsnull != nextSibling) {
- PushChildren(nextSibling, kidFrame, PR_TRUE);
+ PushChildren(nextSibling, kidFrame);
}
result = PR_FALSE;
break;
@@ -513,7 +513,7 @@ PRBool nsTableRowGroupFrame::PullUpChildren(nsIPresContext* aPresContext,
// we pass PR_TRUE into PushChidren
kidFrame->SetNextSibling(continuingFrame);
- PushChildren(continuingFrame, kidFrame, PR_TRUE);
+ PushChildren(continuingFrame, kidFrame);
}
// If the child isn't complete then it means that we've used up