corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed Join() function from nsFrameList, because we already has a version

Browse Source 
of AppendFrames() that did the same exact thing
This commit is contained in:
troy@netscape.com
1999-04-13 00:06:17 +00:00
parent 0c2b62b89c
commit 39dae6702f
10 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
layout/base/public/nsFrameList.h
View File

@@ -97,11 +97,6 @@ public:
nsIFrame* aLastChild,
nsFrameList& aFromList);
void Join(nsIFrame* aParent, nsFrameList& aList) {
AppendFrames(aParent, aList.mFirstChild);
aList.mFirstChild = nsnull;
}
nsIFrame* FirstChild() const {
return mFirstChild;
}

2
layout/generic/nsContainerFrame.cpp
View File

@@ -534,7 +534,7 @@ nsContainerFrame::MoveOverflowToChildList()
// It's also possible that we have an overflow list for ourselves
if (mOverflowFrames.NotEmpty()) {
NS_ASSERTION(mFrames.NotEmpty(), "overflow list w/o frames");
mFrames.Join(nsnull, mOverflowFrames);
mFrames.AppendFrames(nsnull, mOverflowFrames);
result = PR_TRUE;
}
return result;

5
layout/generic/nsFrameList.h
View File

@@ -97,11 +97,6 @@ public:
nsIFrame* aLastChild,
nsFrameList& aFromList);
void Join(nsIFrame* aParent, nsFrameList& aList) {
AppendFrames(aParent, aList.mFirstChild);
aList.mFirstChild = nsnull;
}
nsIFrame* FirstChild() const {
return mFirstChild;
}

2
layout/generic/nsInlineFrame.cpp
View File

@@ -1300,7 +1300,7 @@ nsInlineFrame::DrainOverflow()
// It's also possible that we have an overflow list for ourselves
if (mOverflowFrames.NotEmpty()) {
NS_ASSERTION(mFrames.NotEmpty(), "overflow list w/o frames");
mFrames.Join(nsnull, mOverflowFrames);
mFrames.AppendFrames(nsnull, mOverflowFrames);
}
}

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

@@ -534,7 +534,7 @@ nsContainerFrame::MoveOverflowToChildList()
// It's also possible that we have an overflow list for ourselves
if (mOverflowFrames.NotEmpty()) {
NS_ASSERTION(mFrames.NotEmpty(), "overflow list w/o frames");
mFrames.Join(nsnull, mOverflowFrames);
mFrames.AppendFrames(nsnull, mOverflowFrames);
result = PR_TRUE;
}
return result;

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

@@ -1300,7 +1300,7 @@ nsInlineFrame::DrainOverflow()
// It's also possible that we have an overflow list for ourselves
if (mOverflowFrames.NotEmpty()) {
NS_ASSERTION(mFrames.NotEmpty(), "overflow list w/o frames");
mFrames.Join(nsnull, mOverflowFrames);
mFrames.AppendFrames(nsnull, mOverflowFrames);
}
}

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

@@ -2738,14 +2738,14 @@ nsTableFrame::MoveOverflowToChildList()
nsTableFrame* prevInFlow = (nsTableFrame*)mPrevInFlow;
if (nsnull != prevInFlow) {
if (prevInFlow->mOverflowFrames.NotEmpty()) {
mFrames.Join(this, prevInFlow->mOverflowFrames);
mFrames.AppendFrames(this, prevInFlow->mOverflowFrames);
result = PR_TRUE;
}
}
// It's also possible that we have an overflow list for ourselves
if (mOverflowFrames.NotEmpty()) {
mFrames.Join(nsnull, mOverflowFrames);
mFrames.AppendFrames(nsnull, mOverflowFrames);
result = PR_TRUE;
}
return result;

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

@@ -489,13 +489,13 @@ NS_METHOD nsTableRowGroupFrame::PullUpAllRowFrames(nsIPresContext& aPresContext)
// Any frames on the next-in-flow's overflow list?
if (nextInFlow->mOverflowFrames.NotEmpty()) {
// Yes, append them to its child list
nextInFlow->mFrames.Join(nextInFlow, nextInFlow->mOverflowFrames);
nextInFlow->mFrames.AppendFrames(nextInFlow, nextInFlow->mOverflowFrames);
}
// Any row frames?
if (nextInFlow->mFrames.NotEmpty()) {
// Append them to our child list
mFrames.Join(this, nextInFlow->mFrames);
mFrames.AppendFrames(this, nextInFlow->mFrames);
}
// Move to the next-in-flow

4
layout/tables/nsTableFrame.cpp
View File

@@ -2738,14 +2738,14 @@ nsTableFrame::MoveOverflowToChildList()
nsTableFrame* prevInFlow = (nsTableFrame*)mPrevInFlow;
if (nsnull != prevInFlow) {
if (prevInFlow->mOverflowFrames.NotEmpty()) {
mFrames.Join(this, prevInFlow->mOverflowFrames);
mFrames.AppendFrames(this, prevInFlow->mOverflowFrames);
result = PR_TRUE;
}
}
// It's also possible that we have an overflow list for ourselves
if (mOverflowFrames.NotEmpty()) {
mFrames.Join(nsnull, mOverflowFrames);
mFrames.AppendFrames(nsnull, mOverflowFrames);
result = PR_TRUE;
}
return result;

4
layout/tables/nsTableRowGroupFrame.cpp
View File

@@ -489,13 +489,13 @@ NS_METHOD nsTableRowGroupFrame::PullUpAllRowFrames(nsIPresContext& aPresContext)
// Any frames on the next-in-flow's overflow list?
if (nextInFlow->mOverflowFrames.NotEmpty()) {
// Yes, append them to its child list
nextInFlow->mFrames.Join(nextInFlow, nextInFlow->mOverflowFrames);
nextInFlow->mFrames.AppendFrames(nextInFlow, nextInFlow->mOverflowFrames);
}
// Any row frames?
if (nextInFlow->mFrames.NotEmpty()) {
// Append them to our child list
mFrames.Join(this, nextInFlow->mFrames);
mFrames.AppendFrames(this, nextInFlow->mFrames);
}
// Move to the next-in-flow