Fixed bug where when the aRequestor was the tree owner of the docShell in a content shell list. It was not advancing checking to see if the list had more.
git-svn-id: svn://10.0.0.236/trunk@59188 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
9fa00088e1
commit
12ff2e2039
@ -104,10 +104,8 @@ NS_IMETHODIMP nsChromeTreeOwner::FindItemWithName(const PRUnichar* aName,
|
||||
xulWindow->GetDocShell(getter_AddRefs(shell));
|
||||
|
||||
nsCOMPtr<nsIDocShellTreeItem> shellAsTreeItem(do_QueryInterface(shell));
|
||||
if(shellAsTreeItem)
|
||||
if(shellAsTreeItem && (aRequestor != shellAsTreeItem.get()))
|
||||
{
|
||||
if(aRequestor == shellAsTreeItem.get())
|
||||
continue;
|
||||
// Do this so we can pass in the tree owner as the requestor so the child knows not
|
||||
// to call back up.
|
||||
nsCOMPtr<nsIDocShellTreeOwner> shellOwner;
|
||||
|
||||
@ -102,10 +102,8 @@ NS_IMETHODIMP nsContentTreeOwner::FindItemWithName(const PRUnichar* aName,
|
||||
|
||||
nsCOMPtr<nsIDocShellTreeItem> shellAsTreeItem;
|
||||
xulWindow->GetPrimaryContentShell(getter_AddRefs(shellAsTreeItem));
|
||||
if(shellAsTreeItem)
|
||||
if(shellAsTreeItem && (aRequestor != shellAsTreeItem.get()))
|
||||
{
|
||||
if(aRequestor == shellAsTreeItem.get())
|
||||
continue;
|
||||
// Do this so we can pass in the tree owner as the requestor so the child knows not
|
||||
// to call back up.
|
||||
nsCOMPtr<nsIDocShellTreeOwner> shellOwner;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user