Bug 1770944 - remove dangling textual references of mozbrowser, r=smaug

Depends on D200797 Differential Revision: https://phabricator.services.mozilla.com/D189655
dothq · Feb 22, 2024 · 9ff77a7 · 9ff77a7
1 parent 71e67be
commit 9ff77a7
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 541 deletions.
diff --git a/browser/actors/ContextMenuChild.sys.mjs b/browser/actors/ContextMenuChild.sys.mjs
@@ -471,17 +471,6 @@ export class ContextMenuChild extends JSWindowActorChild {
     return this.contentWindow.HTMLTextAreaElement.isInstance(node);
   }
 
-  /**
-   * Check if we are in the parent process and the current iframe is the RDM iframe.
-   */
-  _isTargetRDMFrame(node) {
-    return (
-      Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_DEFAULT &&
-      node.tagName === "iframe" &&
-      node.hasAttribute("mozbrowser")
-    );
-  }
-
   _isSpellCheckEnabled(aNode) {
     // We can always force-enable spellchecking on textboxes
     if (this._isTargetATextBox(aNode)) {
@@ -545,12 +534,6 @@ export class ContextMenuChild extends JSWindowActorChild {
       return;
     }
 
-    if (this._isTargetRDMFrame(aEvent.composedTarget)) {
-      // The target is in the DevTools RDM iframe, a proper context menu event
-      // will be created from the RDM browser.
-      return;
-    }
-
     let doc = aEvent.composedTarget.ownerDocument;
     let {
       mozDocumentURIIfNotForErrorPages: docLocation,

diff --git a/dom/base/test/chrome/test_swapFrameLoaders.xhtml b/dom/base/test/chrome/test_swapFrameLoaders.xhtml
diff --git a/dom/base/test/chrome/window_swapFrameLoaders.xhtml b/dom/base/test/chrome/window_swapFrameLoaders.xhtml
diff --git a/dom/broadcastchannel/tests/file_mozbrowser.html b/dom/broadcastchannel/tests/file_mozbrowser.html
diff --git a/dom/broadcastchannel/tests/file_mozbrowser2.html b/dom/broadcastchannel/tests/file_mozbrowser2.html
diff --git a/dom/broadcastchannel/tests/iframe_mozbrowser.html b/dom/broadcastchannel/tests/iframe_mozbrowser.html
diff --git a/dom/broadcastchannel/tests/iframe_mozbrowser2.html b/dom/broadcastchannel/tests/iframe_mozbrowser2.html
diff --git a/dom/broadcastchannel/tests/mochitest.toml b/dom/broadcastchannel/tests/mochitest.toml
@@ -4,10 +4,6 @@ support-files = [
   "broadcastchannel_sharedWorker.js",
   "broadcastchannel_worker_alive.js",
   "!/dom/events/test/event_leak_utils.js",
-  "file_mozbrowser.html",
-  "file_mozbrowser2.html",
-  "iframe_mozbrowser.html",
-  "iframe_mozbrowser2.html",
   "testUrl1_bfcache.html",
   "testUrl2_bfcache.html",
 ]

diff --git a/dom/tests/mochitest/chrome/file_bug800817.xhtml b/dom/tests/mochitest/chrome/file_bug800817.xhtml
@@ -30,16 +30,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=800817
     var b1 = document.getElementById("b1");
     var b2 = document.getElementById("b2");
 
-    var testMozBrowser = window.arguments[0].testMozBrowser;
-    if (testMozBrowser) {
-      b1.setAttribute("mozbrowser", "true");
-      b2.setAttribute("mozbrowser", "true");
-    }
-
-    if (testMozBrowser)
-      window.arguments[0].info("Testing with mozbrowser=true");
-    else
-      window.arguments[0].info("Testing without mozbrowser");
+    window.arguments[0].info("Testing...");
 
     b1.contentWindow.focus();
     window.arguments[0].is(document.activeElement, b1,