Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 8 insertions, 15 deletions

diff --git a/dom/html/test/browser_ImageDocument_svg_zoom.js b/dom/html/test/browser_ImageDocument_svg_zoom.js
index f0df2282a3..0bf0b98065 100644
--- a/dom/html/test/browser_ImageDocument_svg_zoom.js
+++ b/dom/html/test/browser_ImageDocument_svg_zoom.js
@@ -13,7 +13,7 @@ function test_once() {
         `${rect.width}x${rect.height}, ${content.innerWidth}x${content.innerHeight}`
       );
       is(
-        Math.round(rect.height),
+        Math.trunc(rect.height),
         content.innerHeight,
         "Should fill the viewport and not overflow"
       );
diff --git a/dom/html/test/browser_bug436200.js b/dom/html/test/browser_bug436200.js
index 7e739c02ad..ca11a3e994 100644
--- a/dom/html/test/browser_bug436200.js
+++ b/dom/html/test/browser_bug436200.js
@@ -8,12 +8,6 @@ const kTestPage = "https://example.org/browser/dom/html/test/bug436200.html";
 async function run_test(shouldShowPrompt, msg) {
   let promptShown = false;
 
-  function tabModalObserver(subject) {
-    promptShown = true;
-    subject.querySelector(".tabmodalprompt-button0").click();
-  }
-  Services.obs.addObserver(tabModalObserver, "tabmodal-dialog-loaded");
-
   function commonDialogObserver(subject) {
     let dialog = subject.Dialog;
     promptShown = true;
@@ -27,7 +21,6 @@ async function run_test(shouldShowPrompt, msg) {
     let form = content.document.getElementById("test_form");
     form.submit();
   });
-  Services.obs.removeObserver(tabModalObserver, "tabmodal-dialog-loaded");
   Services.obs.removeObserver(commonDialogObserver, "common-dialog-loaded");
 
   is(promptShown, shouldShowPrompt, msg);
diff --git a/dom/html/test/forms/test_input_password_click_show_password_button.html b/dom/html/test/forms/test_input_password_click_show_password_button.html
index 76f4e066f5..5a6b24e82c 100644
--- a/dom/html/test/forms/test_input_password_click_show_password_button.html
+++ b/dom/html/test/forms/test_input_password_click_show_password_button.html
@@ -37,16 +37,16 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=502258
     element.type = "text";
     await new Promise(resolve => requestAnimationFrame(resolve));
     var typeTextSnapshot = await snapshotWindow(window);
-    results = compareSnapshots(baseSnapshot, typeTextSnapshot, true);
-    ok(results[0], aId + ": type=text should render the same as type=password that is showing the password");
+    info(aId + ": type=text should render the same as type=password that is showing the password");
+    assertSnapshots(baseSnapshot, typeTextSnapshot, true, null, aId + ": base", aId + ": type=text");
 
     // Re-setting value shouldn't change anything.
     // eslint-disable-next-line no-self-assign
     element.value = element.value;
     var tmpSnapshot = await snapshotWindow(window);
 
-    results = compareSnapshots(baseSnapshot, tmpSnapshot, true);
-    ok(results[0], aId + ": re-setting the value should change nothing");
+    info(aId + ": re-setting the value should change nothing");
+    assertSnapshots(baseSnapshot, tmpSnapshot, true, null, aId + ": base", aId + ": tmp");
   }
 
   async function reset_show_password(aId, concealedSnapshot) {
@@ -54,8 +54,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=502258
     element.type = "password";
     await new Promise(resolve => requestAnimationFrame(resolve));
     var typePasswordSnapshot = await snapshotWindow(window);
-    results = compareSnapshots(concealedSnapshot, typePasswordSnapshot, true);
-    ok(results[0], aId + ": changing the type attribute should conceal the password again");
+    info(aId + ": changing the type attribute should conceal the password again");
+    assertSnapshots(concealedSnapshot, typePasswordSnapshot, true, null, aId + ": concealed", aId + ": type=password");
   }
 
   async function runTest() {
diff --git a/dom/html/test/test_document-element-inserted.html b/dom/html/test/test_document-element-inserted.html
index 6d7e8695ce..59228b393e 100644
--- a/dom/html/test/test_document-element-inserted.html
+++ b/dom/html/test/test_document-element-inserted.html
@@ -28,7 +28,7 @@ var observe = function(doc){
 
 var media = document.getElementById('media');
 var tests = [
-    "../../../media/test/short-video.ogv",
+    "../../../media/test/vp9.webm",
     "../../../media/test/sound.ogg",
     "../../content/test/image.png"
 ]