Bug 1366818, r=emilio

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

Author: gijsk

browser/actors/FormValidationParent.jsm

@@ -10,11 +10,59 @@
 
 var EXPORTED_SYMBOLS = ["FormValidationParent"];
 
+ChromeUtils.defineModuleGetter(
+  this,
+  "BrowserWindowTracker",
+  "resource:///modules/BrowserWindowTracker.jsm"
+);
+
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+class PopupShownObserver {
+  _weakContext = null;
+
+  constructor(browsingContext) {
+    this._weakContext = Cu.getWeakReference(browsingContext);
+  }
+
+  observe(subject, topic, data) {
+    let ctxt = this._weakContext.get();
+    let actor = ctxt.currentWindowGlobal?.getExistingActor("FormValidation");
+    if (!actor) {
+      Services.obs.removeObserver(this, "popup-shown");
+      return;
+    }
+    // If any panel besides ourselves shows, hide ourselves again.
+    if (topic == "popup-shown" && subject != actor._panel) {
+      actor._hidePopup();
+    }
+  }
+
+  QueryInterface = ChromeUtils.generateQI([
+    Ci.nsIObserver,
+    Ci.nsISupportsWeakReference,
+  ]);
+}
+
 class FormValidationParent extends JSWindowActorParent {
   constructor() {
     super();
 
     this._panel = null;
+    this._obs = null;
+  }
+
+  static hasOpenPopups() {
+    for (let win of BrowserWindowTracker.orderedWindows) {
+      let popups = win.document.querySelectorAll("panel,menupopup");
+      for (let popup of popups) {
+        let { state } = popup;
+        if (state == "open" || state == "showing") {
+          return true;
+        }
+      }
+    }
+    return false;
   }
 
   /*
@@ -23,6 +71,7 @@ class FormValidationParent extends JSWindowActorParent {
 
   uninit() {
     this._panel = null;
+    this._obs = null;
   }
 
   hidePopup() {
@@ -47,6 +96,10 @@ class FormValidationParent extends JSWindowActorParent {
           return;
         }
 
+        if (FormValidationParent.hasOpenPopups()) {
+          return;
+        }
+
         this._showPopup(data);
         break;
       case "FormValidation:HidePopup":
@@ -55,10 +108,6 @@ class FormValidationParent extends JSWindowActorParent {
     }
   }
 
-  observe(aSubject, aTopic, aData) {
-    this._hidePopup();
-  }
-
   handleEvent(aEvent) {
     switch (aEvent.type) {
       case "FullZoomChange":
@@ -78,11 +127,13 @@ class FormValidationParent extends JSWindowActorParent {
 
   _onPopupHiding(aEvent) {
     aEvent.originalTarget.removeEventListener("popuphiding", this, true);
+    Services.obs.removeObserver(this._obs, "popup-shown");
     let tabBrowser = aEvent.originalTarget.ownerGlobal.gBrowser;
     tabBrowser.selectedBrowser.removeEventListener("scroll", this, true);
     tabBrowser.selectedBrowser.removeEventListener("FullZoomChange", this);
     tabBrowser.selectedBrowser.removeEventListener("TextZoomChange", this);
 
+    this._obs = null;
     this._panel = null;
   }
 
@@ -110,6 +161,9 @@ class FormValidationParent extends JSWindowActorParent {
     if (!previouslyShown) {
       // Cleanup after the popup is hidden
       this._panel.addEventListener("popuphiding", this, true);
+      // Hide ourselves if other popups shown
+      this._obs = new PopupShownObserver(this.browsingContext);
+      Services.obs.addObserver(this._obs, "popup-shown", true);
 
       // Hide if the user scrolls the page
       tabBrowser.selectedBrowser.addEventListener("scroll", this, true);

layout/xul/nsMenuPopupFrame.cpp

@@ -51,6 +51,7 @@
 #include "mozilla/LookAndFeel.h"
 #include "mozilla/MouseEvents.h"
 #include "mozilla/PresShell.h"
+#include "mozilla/Services.h"
 #include "mozilla/StaticPrefs_xul.h"
 #include "mozilla/dom/BrowserParent.h"
 #include "mozilla/dom/Element.h"
@@ -399,6 +400,13 @@ NS_IMETHODIMP nsXULPopupShownEvent::Run() {
     popup->SetPopupState(ePopupShown);
   }
 
+  if (!mPopup->IsXULElement(nsGkAtoms::tooltip)) {
+    nsCOMPtr<nsIObserverService> obsService =
+        mozilla::services::GetObserverService();
+    if (obsService) {
+      obsService->NotifyObservers(mPopup, "popup-shown", nullptr);
+    }
+  }
   WidgetMouseEvent event(true, eXULPopupShown, nullptr,
                          WidgetMouseEvent::eReal);
   return EventDispatcher::Dispatch(mPopup, mPresContext, &event);