13 files changed, 38 insertions, 26 deletions
diff --git a/dom/html/test/formData_test.js b/dom/html/test/formData_test.js
index 3997aff4d1..8dff5bd606 100644
--- a/dom/html/test/formData_test.js
+++ b/dom/html/test/formData_test.js
@@ -1,3 +1,5 @@
+/* eslint-disable mozilla/no-comparison-or-assignment-inside-ok */
+
 function testHas() {
   var f = new FormData();
   f.append("foo", "bar");
diff --git a/dom/html/test/forms/test_change_event.html b/dom/html/test/forms/test_change_event.html
index 8be4554c58..b20a623439 100644
--- a/dom/html/test/forms/test_change_event.html
+++ b/dom/html/test/forms/test_change_event.html
@@ -61,7 +61,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=722599
 
   SimpleTest.waitForExplicitFinish();
   var MockFilePicker = SpecialPowers.MockFilePicker;
-  MockFilePicker.init(window);
+  MockFilePicker.init(SpecialPowers.wrap(window).browsingContext);
 
   function fileInputBlurTest() {
     var btn = document.getElementById('fileInput');
diff --git a/dom/html/test/forms/test_input_event.html b/dom/html/test/forms/test_input_event.html
index 72863ca335..d3fbba4b3b 100644
--- a/dom/html/test/forms/test_input_event.html
+++ b/dom/html/test/forms/test_input_event.html
@@ -149,7 +149,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=851780
   }
 
   var MockFilePicker = SpecialPowers.MockFilePicker;
-  MockFilePicker.init(window);
+  MockFilePicker.init(SpecialPowers.wrap(window).browsingContext);
 
   function testUserInput() {
     // Simulating an OK click and with a file name return.
diff --git a/dom/html/test/forms/test_input_file_picker.html b/dom/html/test/forms/test_input_file_picker.html
index 296c12bb7e..f05ee9e6a0 100644
--- a/dom/html/test/forms/test_input_file_picker.html
+++ b/dom/html/test/forms/test_input_file_picker.html
@@ -78,7 +78,7 @@ SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 
 var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.init(window);
+MockFilePicker.init(SpecialPowers.wrap(window).browsingContext);
 
 // The following lists are from toolkit/content/filepicker.properties which is used by filePicker
 var imageExtensionList = "*.jpe; *.jpg; *.jpeg; *.gif; *.png; *.bmp; *.ico; *.svg; *.svgz; *.tif; *.tiff; *.ai; *.drw; *.pct; *.psp; *.xcf; *.psd; *.raw; *.webp; *.heic"
diff --git a/dom/html/test/mochitest.toml b/dom/html/test/mochitest.toml
index d1dd78705b..d9a3b34b58 100644
--- a/dom/html/test/mochitest.toml
+++ b/dom/html/test/mochitest.toml
@@ -190,10 +190,13 @@ support-files = [
 
 ["test_allowMedia.html"]
 skip-if = [
-  "verify && (os == 'linux' || os == 'win')",
-  "!debug && os == 'mac' && bits == 64",
-  "debug && os == 'win'",
-  "debug && os == 'linux' && os_version == '18.04'", #Bug 1434744
+  "apple_catalina && !debug",
+  "apple_silicon && !debug",
+  "os == 'linux' && os_version == '18.04' && verify",
+  "os == 'linux' && os_version == '18.04' && debug", #Bug 1434744
+  "win11_2009 && verify",
+  "win10_2009 && debug",
+  "win11_2009 && debug",
 ]
 
 ["test_anchor_href_cache_invalidation.html"]
@@ -324,7 +327,7 @@ skip-if = ["os == 'android'"] #TIMED_OUT
 ["test_bug369370.html"]
 skip-if = [
   "os == 'android'",
-  "os == 'linux'", # disabled on linux bug 1258103
+  "os == 'linux' && os_version == '18.04'", # disabled on linux bug 1258103
 ]
 
 ["test_bug371375.html"]
@@ -597,7 +600,8 @@ fail-if = ["xorigin"]
 ["test_bug615833.html"]
 skip-if = [
   "os == 'android'",
-  "os == 'mac'", #TIMED_OUT # form control not selected/checked with synthesizeMouse, osx(bug 1275664)
+  "apple_catalina", #TIMED_OUT # form control not selected/checked with synthesizeMouse, osx(bug 1275664)
+  "apple_silicon", #TIMED_OUT # form control not selected/checked with synthesizeMouse, osx(bug 1275664)
 ]
 
 ["test_bug618948.html"]
@@ -769,17 +773,22 @@ skip-if = [
 ["test_bug1261673.html"]
 skip-if = [
   "os == 'android'",
-  "os == 'mac'",
+  "apple_catalina",
+  "apple_silicon",
 ]
 
 ["test_bug1261674-1.html"]
 skip-if = [
   "os == 'android'",
-  "os == 'mac'",
+  "apple_catalina",
+  "apple_silicon",
 ]
 
 ["test_bug1261674-2.html"]
-skip-if = ["os == 'mac'"]
+skip-if = [
+  "apple_catalina",
+  "apple_silicon",
+]
 
 ["test_bug1264157.html"]
 
@@ -979,7 +988,8 @@ tags = "openwindow"
 skip-if = [
   "os == 'android' && debug",
   "os == 'linux'",
-  "os == 'win' && debug && bits == 64", # Bug 1533759
+  "win11_2009 && bits == 64 && debug", # Bug 1533759
+  "win10_2009 && bits == 64 && debug", # Bug 1533759
 ]
 
 ["test_window_open_from_closing.html"]
diff --git a/dom/html/test/test_bug389797.html b/dom/html/test/test_bug389797.html
index 701d6e65c9..66396ce54f 100644
--- a/dom/html/test/test_bug389797.html
+++ b/dom/html/test/test_bug389797.html
@@ -115,7 +115,6 @@ HTML_TAG("figure", "")
 HTML_TAG("font", "Font");
 HTML_TAG("footer", "")
 HTML_TAG("form", "Form");
-HTML_TAG("frame", "Frame", [ "nsIDOMMozBrowserFrame" ]);
 HTML_TAG("frameset", "FrameSet");
 HTML_TAG("h1", "Heading");
 HTML_TAG("h2", "Heading");
@@ -129,7 +128,6 @@ HTML_TAG("hgroup", "")
 HTML_TAG("hr", "HR");
 HTML_TAG("html", "Html");
 HTML_TAG("i", "");
-HTML_TAG("iframe", "IFrame", [ "nsIDOMMozBrowserFrame" ]);
 HTML_TAG("image", "");
 HTML_TAG("img", "Image", [ "nsIImageLoadingContent" ], []);
 HTML_TAG("input", "Input", [], [ "imgINotificationObserver",
@@ -171,7 +169,7 @@ HTML_TAG("rtc", "");
 HTML_TAG("ruby", "");
 HTML_TAG("s", "");
 HTML_TAG("samp", "");
-HTML_TAG("script", "Script", [ "nsIScriptLoaderObserver" ], []);
+HTML_TAG("script", "Script");
 HTML_TAG("section", "")
 HTML_TAG("select", "Select");
 HTML_TAG("small", "");
diff --git a/dom/html/test/test_bug500885.html b/dom/html/test/test_bug500885.html
index 3ab9225a4c..5972ed171e 100644
--- a/dom/html/test/test_bug500885.html
+++ b/dom/html/test/test_bug500885.html
@@ -20,7 +20,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=500885
 <script type="text/javascript">
 
 var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.init(window);
+MockFilePicker.init(SpecialPowers.wrap(window).browsingContext);
 MockFilePicker.returnValue = MockFilePicker.returnOK;
 
 async function test() {
diff --git a/dom/html/test/test_bug556645.html b/dom/html/test/test_bug556645.html
index 3c308f9ef6..08a230370f 100644
--- a/dom/html/test/test_bug556645.html
+++ b/dom/html/test/test_bug556645.html
@@ -56,10 +56,12 @@ function runTest(aObjectOrEmbed)
   const pbutton = document.getElementById("pbutton");
   pbutton.focus();
 
-  synthesizeKey("KEY_Tab");
-  is(document.activeElement, aObjectOrEmbed, `${desc}: focus in parent after tab`);
-  is(childDoc.activeElement, childDoc.documentElement, `${desc}: focus in child after tab`);
-
+  let canTabMoveFocusToRootElement = !SpecialPowers.getBoolPref("dom.disable_tab_focus_to_root_element");
+  if (canTabMoveFocusToRootElement) {
+    synthesizeKey("KEY_Tab");
+    is(document.activeElement, aObjectOrEmbed, `${desc}: focus in parent after tab`);
+    is(childDoc.activeElement, childDoc.documentElement, `${desc}: focus in child after tab`);
+  }
   synthesizeKey("KEY_Tab");
   is(document.activeElement, aObjectOrEmbed, `${desc}: focus in parent after tab 2`);
   is(childDoc.activeElement, button, `${desc}: focus in child after tab 2`);
diff --git a/dom/html/test/test_bug592802.html b/dom/html/test/test_bug592802.html
index e8b30d84c8..701559237e 100644
--- a/dom/html/test/test_bug592802.html
+++ b/dom/html/test/test_bug592802.html
@@ -26,7 +26,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=592802
 SimpleTest.waitForExplicitFinish();
 
 var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.init(window);
+MockFilePicker.init(SpecialPowers.wrap(window).browsingContext);
 
 var testData = [
 /* visibility | display | multiple */
diff --git a/dom/html/test/test_filepicker_default_directory.html b/dom/html/test/test_filepicker_default_directory.html
index 2be811655a..565687235f 100644
--- a/dom/html/test/test_filepicker_default_directory.html
+++ b/dom/html/test/test_filepicker_default_directory.html
@@ -34,7 +34,7 @@ var customUploadDirectory = Cc["@mozilla.org/file/directory_service;1"]
 //info("customUploadDirectory" + customUploadDirectory.path);
 
 var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.init(window);
+MockFilePicker.init(SpecialPowers.wrap(window).browsingContext);
 
 // need to show the MockFilePicker so .displayDirectory gets set
 var f = document.getElementById("f");
diff --git a/dom/html/test/test_input_file_cancel_event.html b/dom/html/test/test_input_file_cancel_event.html
index f0fd81c433..64db440485 100644
--- a/dom/html/test/test_input_file_cancel_event.html
+++ b/dom/html/test/test_input_file_cancel_event.html
@@ -14,7 +14,7 @@
 SimpleTest.waitForExplicitFinish();
 
 var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.init(window);
+MockFilePicker.init(SpecialPowers.wrap(window).browsingContext);
 MockFilePicker.useBlobFile();
 MockFilePicker.returnValue = MockFilePicker.returnCancel;
 
diff --git a/dom/html/test/test_input_files_not_nsIFile.html b/dom/html/test/test_input_files_not_nsIFile.html
index e70bc093ee..57a3795de8 100644
--- a/dom/html/test/test_input_files_not_nsIFile.html
+++ b/dom/html/test/test_input_files_not_nsIFile.html
@@ -20,7 +20,7 @@
 SimpleTest.waitForExplicitFinish();
 
 var MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.init(window);
+MockFilePicker.init(SpecialPowers.wrap(window).browsingContext);
 
 SimpleTest.waitForFocus(function() {
   MockFilePicker.useBlobFile();
diff --git a/dom/html/test/test_multipleFilePicker.html b/dom/html/test/test_multipleFilePicker.html
index c4a71151aa..9b342bdfaf 100644
--- a/dom/html/test/test_multipleFilePicker.html
+++ b/dom/html/test/test_multipleFilePicker.html
@@ -25,7 +25,7 @@ foo.addEventListener('click', _ => {
 });
 
 let MockFilePicker = SpecialPowers.MockFilePicker;
-MockFilePicker.init(window);
+MockFilePicker.init(SpecialPowers.wrap(window).browsingContext);
 
 let pickerCount = 0;