From 6ce653cd9dd3ac66f13fb6ed9295925e474996ab Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Tue, 5 Jun 2001 01:08:31 +0000 Subject: [PATCH] Fix for 83642. r=jag, sr=blake, a=tor git-svn-id: svn://10.0.0.236/trunk@96393 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsPresShell.cpp | 4 +--- mozilla/layout/html/base/src/nsPresShell.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index 682ec5b13c5..1cdcf5dbcb4 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -2412,10 +2412,8 @@ static void CheckForFocus(nsPIDOMWindow* aOurWindow, nsIFocusController* aFocusC if (domWindow == focusedWindow) { PRBool active; aFocusController->GetActive(&active); - aFocusController->SetFocusedElement(nsnull); if(active) { - // We need to restore focus and make sure we null - // out the focused element. + // We need to restore focus to the window. domWindow->Focus(); } } diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index 682ec5b13c5..1cdcf5dbcb4 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -2412,10 +2412,8 @@ static void CheckForFocus(nsPIDOMWindow* aOurWindow, nsIFocusController* aFocusC if (domWindow == focusedWindow) { PRBool active; aFocusController->GetActive(&active); - aFocusController->SetFocusedElement(nsnull); if(active) { - // We need to restore focus and make sure we null - // out the focused element. + // We need to restore focus to the window. domWindow->Focus(); } }