Bug 1676127 - Don't deactivate top-level remote browser twice when browser window is lowered; r=hsivonen

Differential Revision: https://phabricator.services.mozilla.com/D96404

dom/base/nsFocusManager.cpp

@@ -2226,26 +2226,21 @@ bool nsFocusManager::BlurImpl(BrowsingContext* aBrowsingContextToClear,
     // content
     if (BrowserParent* remote = BrowserParent::GetFrom(element)) {
       MOZ_ASSERT(XRE_IsParentProcess());
-      // First, let's deactivate all out-of-process iframes.
+      // Let's deactivate all remote browsers.
       BrowsingContext* topLevelBrowsingContext = remote->GetBrowsingContext();
       topLevelBrowsingContext->PreOrderWalk([&](BrowsingContext* aContext) {
-        WindowGlobalParent* windowGlobalParent =
+        if (WindowGlobalParent* windowGlobalParent =
-            aContext->Canonical()->GetCurrentWindowGlobal();
+                aContext->Canonical()->GetCurrentWindowGlobal()) {
-        if (windowGlobalParent) {
+          if (RefPtr<BrowserParent> browserParent =
-          RefPtr<BrowserParent> browserParent =
+                  windowGlobalParent->GetBrowserParent()) {
-              windowGlobalParent->GetBrowserParent();
-          if (browserParent) {
             browserParent->Deactivate(windowBeingLowered);
-            LOGFOCUS(("OOP iframe remote browser deactivated %p, %d", remote,
+            LOGFOCUS(("%s remote browser deactivated %p, %d",
-                      windowBeingLowered));
+                      aContext == topLevelBrowsingContext ? "Top-level"
+                                                          : "OOP iframe",
+                      browserParent.get(), windowBeingLowered));
           }
         }
       });
-
-      // Now deactivate the top-level Web page.
-      remote->Deactivate(windowBeingLowered);
-      LOGFOCUS(("Top-level Remote browser deactivated %p, %d", remote,
-                windowBeingLowered));
     }
 
     // Same as above but for out-of-process iframes