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

Bug 70484 - browser window would go keydead when clicking a link inside a FRAME which loaded a new document into the top-level content area. r=saari, sr=hyatt, a=asa.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@97486 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%uiuc.edu
2001-06-19 23:31:25 +00:00
parent 2672dac30c
commit 881232ec6f
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/docshell/base/nsDocShell.cpp
View File

@@ -3928,7 +3928,32 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
nsCOMPtr<nsIDOMWindowInternal> focusedWindow;
focusController->GetFocusedWindow(getter_AddRefs(focusedWindow));
nsCOMPtr<nsIDOMWindowInternal> ourFocusedWindow(do_QueryInterface(ourWindow));
if (ourFocusedWindow == focusedWindow)
// We want to null out the last focused element if the document containing
// it is going away. If the last focused element is in a descendent
// window of our domwindow, its document will be destroyed when we
// destroy our children. So, check for this case and null out the
// last focused element. See bug 70484.
PRBool isSubWindow = PR_FALSE;
nsCOMPtr<nsIDOMWindow> curwin;
if (focusedWindow)
focusedWindow->GetParent(getter_AddRefs(curwin));
while (curwin) {
if (curwin == NS_STATIC_CAST(nsIDOMWindow*, ourFocusedWindow)) {
isSubWindow = PR_TRUE;
break;
}
nsIDOMWindow* temp;
curwin->GetParent(&temp);
if (curwin == temp) {
NS_RELEASE(temp);
break;
}
curwin = dont_AddRef(temp);
}
if (ourFocusedWindow == focusedWindow || isSubWindow)
focusController->SetFocusedElement(nsnull);
}
}