Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor bug fixing; reworked PullFrame; added VerifyParent

Browse Source
This commit is contained in:
kipp%netscape.com 1999-02-01 17:32:05 +00:00
parent ddc318eee2
commit a548c870f8
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,7 @@ nsFrameList::RemoveFrame(nsIFrame* aFrame)
if (nsnull != aFrame) {
nsIFrame* nextFrame;
aFrame->GetNextSibling(nextFrame);
aFrame->SetNextSibling(nsnull);
if (aFrame == mFirstChild) {
mFirstChild = nextFrame;
return PR_TRUE;
@ -98,6 +99,7 @@ nsFrameList::RemoveFirstChild()
if (nsnull != mFirstChild) {
nsIFrame* nextFrame;
mFirstChild->GetNextSibling(nextFrame);
mFirstChild->SetNextSibling(nsnull);
mFirstChild = nextFrame;
return PR_TRUE;
}
@ -217,11 +219,9 @@ nsFrameList::Split(nsIFrame* aAfterFrame, nsIFrame** aNextFrameResult)
{
NS_PRECONDITION(nsnull != aAfterFrame, "null ptr");
NS_PRECONDITION(nsnull != aNextFrameResult, "null ptr");
NS_ASSERTION(aAfterFrame != mFirstChild, "bad split");
NS_ASSERTION(ContainsFrame(aAfterFrame), "split after unknown frame");
if ((nsnull != aNextFrameResult) && (nsnull != aAfterFrame) &&
(aAfterFrame != mFirstChild)) {
if ((nsnull != aNextFrameResult) && (nsnull != aAfterFrame)) {
nsIFrame* nextFrame;
aAfterFrame->GetNextSibling(nextFrame);
aAfterFrame->SetNextSibling(nsnull);
@ -231,21 +231,32 @@ nsFrameList::Split(nsIFrame* aAfterFrame, nsIFrame** aNextFrameResult)
return PR_FALSE;
}
PRBool
nsIFrame*
nsFrameList::PullFrame(nsIFrame* aParent,
nsFrameList& aFromList,
nsIFrame** aResult)
nsIFrame* aLastChild,
nsFrameList& aFromList)
{
NS_PRECONDITION(nsnull != aResult, "null ptr");
if (nsnull != aResult) {
nsIFrame* pulledFrame = aFromList.FirstChild();
NS_PRECONDITION(nsnull != aParent, "null ptr");
nsIFrame* pulledFrame = nsnull;
if (nsnull != aParent) {
pulledFrame = aFromList.FirstChild();
if (nsnull != pulledFrame) {
aFromList.RemoveFrame(pulledFrame);
AppendFrame(aParent, pulledFrame);
return PR_TRUE;
// Take frame off old list
aFromList.RemoveFirstChild();
// Put it on the end of this list
if (nsnull == aLastChild) {
NS_ASSERTION(nsnull == mFirstChild, "bad aLastChild");
mFirstChild = pulledFrame;
}
else {
aLastChild->SetNextSibling(pulledFrame);
}
pulledFrame->SetParent(aParent);
}
}
return PR_FALSE;
return pulledFrame;
}
nsIFrame*
@ -319,3 +330,17 @@ nsFrameList::GetPrevSiblingFor(nsIFrame* aFrame) const
}
return frame;
}
void
nsFrameList::VerifyParent(nsIFrame* aParent) const
{
#ifdef NS_DEBUG
nsIFrame* frame = mFirstChild;
while (nsnull != frame) {
nsIFrame* parent;
frame->GetParent(parent);
NS_ASSERTION(parent == aParent, "bad parent");
frame->GetNextSibling(frame);
}
#endif
}