Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix nsBoxFrame::RelayoutChildAtOrdinal to not clobber the first child in the list. Remove no-op nsIFrame::SetNextBox(). Thanks to darin for help with the patch, and r+sr=roc. Bug 262054.

Browse Source
This commit is contained in:
bryner%brianryner.com 2004-09-30 00:18:49 +00:00
parent f34bbf06b7
commit aed8386f51
3 changed files with 33 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1326,7 +1326,6 @@ NS_PTR_TO_INT32(frame->GetProperty(nsLayoutAtoms::embeddingLevel))
*aBox = (mParent && mParent->IsBoxFrame()) ? mNextSibling : nsnull;
return NS_OK;
}
nsresult SetNextBox(nsIBox* aBox) { return NS_OK; }
NS_HIDDEN_(nsresult) GetParentBox(nsIBox** aParent);
NS_IMETHOD GetBorderAndPadding(nsMargin& aBorderAndPadding);
NS_IMETHOD GetBorder(nsMargin& aBorderAndPadding)=0;

1
layout/generic/nsIFrame.h
View File

@ -1326,7 +1326,6 @@ NS_PTR_TO_INT32(frame->GetProperty(nsLayoutAtoms::embeddingLevel))
*aBox = (mParent && mParent->IsBoxFrame()) ? mNextSibling : nsnull;
return NS_OK;
}
nsresult SetNextBox(nsIBox* aBox) { return NS_OK; }
NS_HIDDEN_(nsresult) GetParentBox(nsIBox** aParent);
NS_IMETHOD GetBorderAndPadding(nsMargin& aBorderAndPadding);
NS_IMETHOD GetBorder(nsMargin& aBorderAndPadding)=0;

86
layout/xul/base/src/nsBoxFrame.cpp
View File

@ -2698,69 +2698,49 @@ nsBoxFrame::RelayoutChildAtOrdinal(nsBoxLayoutState& aState, nsIBox* aChild)
PRUint32 ord;
aChild->GetOrdinal(aState, ord);
PRUint32 ordCmp;
nsIFrame *firstChild = mFrames.FirstChild();
nsIBox* box = firstChild;
nsIBox* newPrevSib = firstChild;
box->GetOrdinal(aState, ordCmp);
if (ord < ordCmp) {
// new ordinal is lower than the lowest current ordinal, so it will not
// have a previous sibling
newPrevSib = nsnull;
} else {
// search for the box after which we will insert this box
while (box) {
box->GetOrdinal(aState, ordCmp);
if (newPrevSib && ordCmp > ord)
break;
newPrevSib = box;
box->GetNextBox(&box);
}
nsIFrame *child = mFrames.FirstChild();
nsIFrame *curPrevSib = nsnull, *newPrevSib = nsnull;
PRBool foundPrevSib = PR_FALSE, foundNewPrevSib = PR_FALSE;
while (child) {
if (child == aChild)
foundPrevSib = PR_TRUE;
else if (!foundPrevSib)
curPrevSib = child;
PRUint32 ordCmp;
child->GetOrdinal(aState, ordCmp);
if (ord < ordCmp)
foundNewPrevSib = PR_TRUE;
else if (!foundNewPrevSib)
newPrevSib = child;
child->GetNextBox(&child);
}
// look for the previous sibling of |aChild|
nsIBox* oldPrevSib = firstChild;
while (oldPrevSib) {
nsIBox* me;
oldPrevSib->GetNextBox(&me);
if (aChild == me) {
break;
}
oldPrevSib = me;
NS_ASSERTION(foundPrevSib, "aChild not in frame list?");
if (curPrevSib == newPrevSib) {
// This box is not moving.
return NS_OK;
}
// if we are moving |mFirstChild|, we'll have to update the |mFirstChild|
// value later on
PRBool firstChildMoved = PR_FALSE;
if (aChild == firstChild)
firstChildMoved = PR_TRUE;
// Take aChild out of its old position in the child list.
if (curPrevSib)
curPrevSib->SetNextSibling(aChild->GetNextSibling());
nsIBox* newNextSib;
if (newPrevSib) {
// insert |aChild| between |newPrevSib| and its next sibling
newPrevSib->GetNextBox(&newNextSib);
newPrevSib->SetNextBox(aChild);
newNextSib = newPrevSib->GetNextSibling();
newPrevSib->SetNextSibling(aChild);
} else {
// no |newPrevSib| found, so this box will become |mFirstChild|
newNextSib = firstChild;
firstChild = aChild;
newNextSib = mFrames.FirstChild();
mFrames.SetFrames(aChild);
}
// link up our new next sibling
nsIBox* oldNextSib;
aChild->GetNextBox(&oldNextSib);
aChild->SetNextBox(newNextSib);
// link |oldPrevSib| with |oldNextSib| to fill the gap left behind
if (oldPrevSib)
oldPrevSib->SetNextBox(oldNextSib);
if (firstChildMoved)
firstChild = oldNextSib;
mFrames.SetFrames(firstChild);
aChild->SetNextSibling(newNextSib);
return NS_OK;
}