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

Fix nsWindowWatcher::FindItemWithName to pass in the right requestor; expose it

Browse Source 
on nsPIWindowWatcher and use it from nsDocShellTreeOwner.  Bug 282296, r=danm,
sr=jst


git-svn-id: svn://10.0.0.236/trunk@170137 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2005-03-03 17:26:34 +00:00
parent 0f74bb7c44
commit baca2afa60
4 changed files with 60 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
View File

@@ -325,52 +325,12 @@ nsDocShellTreeOwner::FindItemWithNameAcrossWindows(const PRUnichar* aName,
nsIDocShellTreeItem** aFoundItem)
{
// search for the item across the list of top-level windows
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
nsCOMPtr<nsPIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
if (!wwatch)
return NS_OK;
PRBool more;
nsresult rv;
nsCOMPtr<nsISimpleEnumerator> windows;
wwatch->GetWindowEnumerator(getter_AddRefs(windows));
rv = NS_OK;
do {
windows->HasMoreElements(&more);
if (!more)
break;
nsCOMPtr<nsISupports> nextSupWindow;
windows->GetNext(getter_AddRefs(nextSupWindow));
if (nextSupWindow) {
// it's a DOM Window. cut straight to the ScriptGlobalObject.
nsCOMPtr<nsIScriptGlobalObject> sgo(do_QueryInterface(nextSupWindow));
if (sgo) {
nsCOMPtr<nsIDocShellTreeItem> item =
do_QueryInterface(sgo->GetDocShell());
if (item) {
// Get the root tree item of same type, since roots are the only
// things that call into the treeowner to look for named items.
nsCOMPtr<nsIDocShellTreeItem> root;
item->GetSameTypeRootTreeItem(getter_AddRefs(root));
NS_ASSERTION(root, "Must have root tree item of same type");
// Make sure not to call back into our kid if we got called from it
if (root != aRequestor) {
// Get the tree owner so we can pass it in as the
// requestor so the child knows not to call back up.
nsCOMPtr<nsIDocShellTreeOwner> rootOwner;
root->GetTreeOwner(getter_AddRefs(rootOwner));
rv = root->FindItemWithName(aName, rootOwner, aOriginalRequestor,
aFoundItem);
if (NS_FAILED(rv) || *aFoundItem)
break;
}
}
}
}
} while(1);
return rv;
return wwatch->FindItemWithName(aName, aRequestor, aOriginalRequestor,
aFoundItem);
}
void