Merging upstream version 126.0.

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

4 files changed, 6 insertions, 6 deletions

diff --git a/testing/web-platform/tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html b/testing/web-platform/tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html
index eb7b443df3..44dfa80153 100644
--- a/testing/web-platform/tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html
+++ b/testing/web-platform/tests/mixed-content/tentative/autoupgrades/mixed-content-cors.https.sub.html
@@ -67,11 +67,11 @@
         var otherHost = get_host_info().HTTP_NOTSAMESITE_ORIGIN.slice(0, -4); // cut of http port
         var url = new URL(
           otherHost +
-            "{{ports[https][0]}}/mixed-content/tentative/resources/test.ogv?pipe=header(Access-Control-Allow-Origin,*)"
+            "{{ports[https][0]}}/mixed-content/tentative/resources/test.webm?pipe=header(Access-Control-Allow-Origin,*)"
         );
         var i = document.createElement("video");
         i.oncanplaythrough = test.step_func_done((_) => {
-          assert_equals(Math.floor(i.duration), 300, "Length. Other host");
+          assert_equals(Math.floor(i.duration), 1, "Length. Other host");
         });
         i.crossOrigin = "anonymous";
         i.onerror = test.unreached_func(
diff --git a/testing/web-platform/tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html b/testing/web-platform/tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html
index ea2d07309c..d9ad3dda39 100644
--- a/testing/web-platform/tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html
+++ b/testing/web-platform/tests/mixed-content/tentative/autoupgrades/video-upgrade.https.sub.html
@@ -13,10 +13,10 @@
 
     function assert_video_loads(test) {
         // Since autoupgrades don't upgrade custom ports, we use the https port with an HTTP scheme. A successful autoupgrade will result in the right URL loading (and no autoupgrade will result in failure).
-        var url = new URL("http://{{host}}:{{ports[https][0]}}/mixed-content/tentative/resources/test.ogv")
+        var url = new URL("http://{{host}}:{{ports[https][0]}}/mixed-content/tentative/resources/test.webm")
         var i = document.createElement('video');
         i.oncanplaythrough = test.step_func_done(_ => {
-            assert_equals(Math.floor(i.duration), 300, "Length.");
+            assert_equals(Math.floor(i.duration), 1, "Length.");
         });
         i.onerror = test.unreached_func("Video should load successfully from " + url);
         i.src = url;
@@ -28,10 +28,10 @@
     function assert_other_host_video_loads(test) {
         // Since autoupgrades don't upgrade custom ports, we use the https port with an HTTP scheme. A successful autoupgrade will result in the right URL loading (and no autoupgrade will result in failure).
         var otherHost = get_host_info().HTTP_NOTSAMESITE_ORIGIN.slice(0,-4); // cut of http port
-        var url = new URL( otherHost + "{{ports[https][0]}}/mixed-content/tentative/resources/test.ogv")
+        var url = new URL( otherHost + "{{ports[https][0]}}/mixed-content/tentative/resources/test.webm")
         var i = document.createElement('video');
         i.oncanplaythrough = test.step_func_done(_ => {
-            assert_equals(Math.floor(i.duration), 300, "Length. Other host");
+            assert_equals(Math.floor(i.duration), 1, "Length. Other host");
         });
         i.onerror = test.unreached_func("Video of other host should load successfully from " + url);
         i.src = url;
diff --git a/testing/web-platform/tests/mixed-content/tentative/resources/test.ogv b/testing/web-platform/tests/mixed-content/tentative/resources/test.ogv
deleted file mode 100644
index 0f83996e5d..0000000000
--- a/testing/web-platform/tests/mixed-content/tentative/resources/test.ogv
+++ /dev/null
diff --git a/testing/web-platform/tests/mixed-content/tentative/resources/test.webm b/testing/web-platform/tests/mixed-content/tentative/resources/test.webm
new file mode 100644
index 0000000000..e3e4cb0bac
--- /dev/null
+++ b/testing/web-platform/tests/mixed-content/tentative/resources/test.webm