Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 307298 Crash adding treeitems to the document element r=varga sr=bz

Browse Source
This commit is contained in:
neil%parkwaycc.co.uk 2005-09-21 19:36:14 +00:00
parent 7002686d0d
commit ccf2da6b12
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
layout/xul/base/src/tree/src/nsTreeContentView.cpp
View File

@ -920,15 +920,13 @@ nsTreeContentView::ContentInserted(nsIDocument *aDocument,
// If we have a legal tag, go up to the tree/select and make sure
// that it's ours.
for (nsIContent* element = aContainer; element; element = element->GetParent()) {
for (nsIContent* element = aContainer; element != mRoot; element = element->GetParent()) {
if (!element)
return; // this is not for us
nsIAtom *parentTag = element->Tag();
if ((element->IsContentOfType(nsIContent::eXUL) && parentTag == nsXULAtoms::tree) ||
(element->IsContentOfType(nsIContent::eHTML) && parentTag == nsHTMLAtoms::select)) {
if (element == mRoot) // this is for us, stop looking
break;
else // this is not for us, we can bail out
return;
}
(element->IsContentOfType(nsIContent::eHTML) && parentTag == nsHTMLAtoms::select))
return; // this is not for us
}
if (childTag == nsXULAtoms::treechildren) {
@ -1004,15 +1002,14 @@ nsTreeContentView::ContentRemoved(nsIDocument *aDocument,
// If we have a legal tag, go up to the tree/select and make sure
// that it's ours.
for (nsIContent* element = aContainer; element; element = element->GetParent()) {
for (nsIContent* element = aContainer; element != mRoot; element = element->GetParent()) {
if (!element)
return; // this is not for us
nsIAtom *parentTag = element->Tag();
if ((element->IsContentOfType(nsIContent::eXUL) && parentTag == nsXULAtoms::tree) ||
(element->IsContentOfType(nsIContent::eHTML) && parentTag == nsHTMLAtoms::select)) {
if (element == mRoot) // this is for us, stop looking
break;
else // this is not for us, we can bail out
return;
}
(element->IsContentOfType(nsIContent::eHTML) && parentTag == nsHTMLAtoms::select))
return; // this is not for us
}
if (tag == nsXULAtoms::treechildren) {