Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 371083: Second installment in our exiting series 'deCOMtaminate the XBL code'. r/sr=jst

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@220967 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jonas%sicking.cc
2007-02-27 00:14:01 +00:00
parent 6fc2466897
commit fa54a7bcf5
15 changed files with 164 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/content/base/src/nsContentUtils.cpp
View File

@@ -1346,35 +1346,29 @@ nsContentUtils::FindFirstChildWithResolvedTag(nsIContent* aParent,
PRInt32 aNamespace,
nsIAtom* aTag)
{
if (!aParent) {
nsIDocument* doc;
if (!aParent || !(doc = aParent->GetOwnerDoc())) {
return nsnull;
}
nsBindingManager* bindingManager = doc->BindingManager();
nsresult rv;
nsCOMPtr<nsIXBLService> xblService =
do_GetService("@mozilla.org/xbl;1", &rv);
PRInt32 namespaceID;
PRUint32 count = aParent->GetChildCount();
PRUint32 i;
nsCOMPtr<nsIAtom> tag;
for (i = 0; i < count; i++) {
nsIContent *child = aParent->GetChildAt(i);
xblService->ResolveTag(child, &namespaceID, getter_AddRefs(tag));
nsIAtom* tag = bindingManager->ResolveTag(child, &namespaceID);
if (tag == aTag && namespaceID == aNamespace) {
return child;
}
}
// now look for children in XBL
nsIDocument* doc = aParent->GetDocument();
if (!doc) {
return nsnull;
}
nsCOMPtr<nsIDOMNodeList> children;
doc->BindingManager()->GetXBLChildNodesFor(aParent, getter_AddRefs(children));
bindingManager->GetXBLChildNodesFor(aParent, getter_AddRefs(children));
if (!children) {
return nsnull;
}
@@ -1385,7 +1379,7 @@ nsContentUtils::FindFirstChildWithResolvedTag(nsIContent* aParent,
nsCOMPtr<nsIDOMNode> childNode;
children->Item(i, getter_AddRefs(childNode));
nsCOMPtr<nsIContent> childContent = do_QueryInterface(childNode);
xblService->ResolveTag(childContent, &namespaceID, getter_AddRefs(tag));
nsIAtom* tag = bindingManager->ResolveTag(childContent, &namespaceID);
if (tag == aTag && namespaceID == aNamespace) {
return childContent;
}