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

Bug 529087: Fix crash involving XBL and cloned XUL elements. r=smaug

Browse Source
This commit is contained in:
Jonas Sicking 2010-05-26 15:39:13 -07:00
parent 7e8118a1bf
commit f2fa47761e
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
content/base/src/nsNodeUtils.cpp
View File

@ -269,8 +269,22 @@ nsNodeUtils::LastRelease(nsINode* aNode)
if (aNode->IsElement()) {
nsIDocument* ownerDoc = aNode->GetOwnerDoc();
Element* elem = aNode->AsElement();
if (ownerDoc) {
ownerDoc->ClearBoxObjectFor(aNode->AsElement());
ownerDoc->ClearBoxObjectFor(elem);
}
NS_ASSERTION(aNode->HasFlag(NODE_FORCE_XBL_BINDINGS) ||
!ownerDoc ||
!ownerDoc->BindingManager() ||
!ownerDoc->BindingManager()->GetBinding(cont),
"Non-forced node has binding on destruction");
// if NODE_FORCE_XBL_BINDINGS is set, the node might still have a binding
// attached
if (aNode->HasFlag(NODE_FORCE_XBL_BINDINGS) &&
ownerDoc && ownerDoc->BindingManager()) {
ownerDoc->BindingManager()->ChangeDocumentFor(elem, ownerDoc, nsnull);
}
}

4
content/xbl/src/nsXBLBinding.cpp
View File

@ -972,7 +972,9 @@ nsXBLBinding::ExecuteAttachedHandler()
if (mNextBinding)
mNextBinding->ExecuteAttachedHandler();
if (AllowScripts())
// Executing mNextBindings constructor might have caused us to loose our
// bound element
if (mBoundElement && AllowScripts())
mPrototypeBinding->BindingAttached(mBoundElement);
}