Bug 1721982 - [marionette] Use domwindowopened observer to detect new…

…ly opened windows. r=webdriver-reviewers,jdescottes Differential Revision: https://phabricator.services.mozilla.com/D120734
dothq · Jul 26, 2021 · 8fdd8d1 · 8fdd8d1
1 parent bd33c9c
commit 8fdd8d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/remote/marionette/modal.js b/remote/marionette/modal.js
@@ -110,8 +110,8 @@ modal.DialogObserver = class {
 
   register() {
     Services.obs.addObserver(this, "common-dialog-loaded");
+    Services.obs.addObserver(this, "domwindowopened");
     Services.obs.addObserver(this, "tabmodal-dialog-loaded");
-    Services.obs.addObserver(this, "toplevel-window-ready");
 
     // Register event listener for all already open windows
     for (let win of Services.wm.getEnumerator(null)) {
@@ -121,8 +121,8 @@ modal.DialogObserver = class {
 
   unregister() {
     Services.obs.removeObserver(this, "common-dialog-loaded");
+    Services.obs.removeObserver(this, "domwindowopened");
     Services.obs.removeObserver(this, "tabmodal-dialog-loaded");
-    Services.obs.removeObserver(this, "toplevel-window-ready");
 
     // Unregister event listener for all open windows
     for (let win of Services.wm.getEnumerator(null)) {
@@ -200,7 +200,7 @@ modal.DialogObserver = class {
         );
         break;
 
-      case "toplevel-window-ready":
+      case "domwindowopened":
         subject.addEventListener("DOMModalDialogClosed", this);
         break;
     }

diff --git a/remote/marionette/test/xpcshell/test_modal.js b/remote/marionette/test/xpcshell/test_modal.js
@@ -79,7 +79,7 @@ add_test(function test_registerDialogClosedEventHandler() {
     },
   };
 
-  observer.observe(mockChromeWindow, "toplevel-window-ready");
+  observer.observe(mockChromeWindow, "domwindowopened");
 });
 
 add_test(function test_handleCallbackOpenModalDialog() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,7 +79,7 @@ add_test(function test_registerDialogClosedEventHandler() { @@
         },
       };
-      observer.observe(mockChromeWindow, "toplevel-window-ready");
+      observer.observe(mockChromeWindow, "domwindowopened");
     });
     add_test(function test_handleCallbackOpenModalDialog() {
@@ Expand Down @@