Bug 477071, r=enndeakin, sr=neil

--HG--
extra : rebase_source : d19ed0f318958f9905c77e22c257737cdbc7bb6b
This commit is contained in:
Olli Pettay 2009-08-06 17:35:07 +03:00
parent 058342d150
commit 16d049ed6b

View File

@ -1669,8 +1669,14 @@ nsXULTemplateBuilder::GetTemplateRoot(nsIContent** aResult)
nsCOMPtr<nsIDOMElement> domElement;
domDoc->GetElementById(templateID, getter_AddRefs(domElement));
if (domElement)
return CallQueryInterface(domElement, aResult);
if (domElement) {
nsCOMPtr<nsIContent> content = do_QueryInterface(domElement);
NS_ENSURE_STATE(content &&
!nsContentUtils::ContentIsDescendantOf(mRoot,
content));
content.forget(aResult);
return NS_OK;
}
}
#if 1 // XXX hack to workaround bug with XBL insertion/removal?