deactivate root focus controller as well as your own while deactivating yourself. bug 122462 / bugscape 11864 code=saari,myself r=bryner,hyatt

embedding/browser/webBrowser/nsWebBrowser.cpp

@@ -1677,9 +1677,14 @@ NS_IMETHODIMP nsWebBrowser::Deactivate(void)
   GetContentDOMWindow(getter_AddRefs(domWindow));
   if (domWindow) {
     nsCOMPtr<nsPIDOMWindow> privateDOMWindow = do_QueryInterface(domWindow);
-        if(privateDOMWindow)
+    if(privateDOMWindow) {
+      nsCOMPtr<nsIFocusController> focusController;
+      privateDOMWindow->GetRootFocusController(getter_AddRefs(focusController));
+      if (focusController)
+        focusController->SetActive(PR_FALSE);
       privateDOMWindow->Deactivate();
     }
+  }
 
   return NS_OK;
 }

xpfe/appshell/src/nsWebShellWindow.cpp

@@ -542,9 +542,14 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
         else */
         if (domWindow) {
           nsCOMPtr<nsPIDOMWindow> privateDOMWindow = do_QueryInterface(domWindow);
-          if(privateDOMWindow)
+          if(privateDOMWindow) {
+            nsCOMPtr<nsIFocusController> focusController;
+            privateDOMWindow->GetRootFocusController(getter_AddRefs(focusController));
+            if (focusController)
+              focusController->SetActive(PR_FALSE);
             privateDOMWindow->Deactivate();
           }
+        }
         break;
       }