From 54d9c30a346d86e71c7564b84bff710fb8c49807 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 23 Apr 2024 06:30:02 +0200
Subject: Merging upstream version 125.0.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 ...download_allow_downloads.sub.tentative.html.ini |  4 ++
 ...ad_allow_downloads.sub.tentative.https.html.ini |  4 --
 ...pen_download_allow_downloads.tentative.html.ini |  3 ++
 ...wnload_allow_downloads.tentative.https.html.ini |  3 --
 ...ion_download_allow_downloads.sub.tentative.html | 52 ++++++++++++++++++++++
 ...wnload_allow_downloads.sub.tentative.https.html | 52 ----------------------
 ...ow_open_download_allow_downloads.tentative.html | 29 ++++++++++++
 ...n_download_allow_downloads.tentative.https.html | 29 ------------
 8 files changed, 88 insertions(+), 88 deletions(-)
 create mode 100644 testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html.ini
 create mode 100644 testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.https.html.ini
 create mode 100644 testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html
 delete mode 100644 testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html
 create mode 100644 testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html
 delete mode 100644 testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.https.html

(limited to 'testing/web-platform')

diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
new file mode 100644
index 0000000000..b0d48fef3b
--- /dev/null
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html.ini
@@ -0,0 +1,4 @@
+[iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html]
+  expected:
+    if (os == "linux") and not fission: [OK, TIMEOUT]
+    if (os == "android") and fission: [TIMEOUT, OK]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html.ini
deleted file mode 100644
index b4dbc800df..0000000000
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html]
-  expected:
-    if (os == "linux") and not fission: [OK, TIMEOUT]
-    if (os == "android") and fission: [TIMEOUT, OK]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html.ini
new file mode 100644
index 0000000000..2483b6391c
--- /dev/null
+++ b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html.ini
@@ -0,0 +1,3 @@
+[iframe_sandbox_window_open_download_allow_downloads.tentative.html]
+  expected:
+    if (os == "android") and fission: [OK, TIMEOUT]
diff --git a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.https.html.ini b/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.https.html.ini
deleted file mode 100644
index 773edf42b7..0000000000
--- a/testing/web-platform/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.https.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[iframe_sandbox_window_open_download_allow_downloads.tentative.https.html]
-  expected:
-    if (os == "android") and fission: [OK, TIMEOUT]
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html
new file mode 100644
index 0000000000..6b3b3104ef
--- /dev/null
+++ b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Navigation resulted download in sandbox is allowed by allow-downloads.</title>
+<meta name="timeout" content="long" />
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-iframe-sandbox">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
+<script src="/resources/testharness.js"></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src="support/iframe_sandbox_download_helper.js"></script>
+<body>
+<script>
+"use strict";
+
+async_test(t => {
+    const token = "{{$id:uuid()}}";
+    var iframe = document.createElement("iframe");
+    iframe.srcdoc = "<a>Download</a>";
+    iframe.sandbox = "allow-same-origin allow-downloads";
+    iframe.onload = t.step_func(function () {
+        iframe.contentWindow.addEventListener(
+            "unload", t.unreached_func("Unexpected navigation."));
+        var anchor = iframe.contentDocument.getElementsByTagName('a')[0];
+        // Set |finish-delay| to let the server stream a response over a  period
+        // of time, so it's able to catch potential download cancellation by
+        // detecting a socket close.
+        anchor.href = "support/download_stash.py?token=" + token + "&finish-delay=" + StreamDownloadFinishDelay();
+        anchor.click();
+        AssertDownloadSuccess(t, token, StreamDownloadFinishDelay() + DownloadVerifyDelay());
+    });
+
+    document.body.appendChild(iframe);
+}, "Navigation resulted download in sandbox is allowed by allow-downloads.");
+
+async_test(t => {
+    const token = "{{$id:uuid()}}";
+    var iframe = document.createElement("iframe");
+
+    const folder = location.origin+"/html/semantics/embedded-content/the-iframe-element/";
+    const href = `${folder}support/download_stash.py?token=${token}&finish-delay=${StreamDownloadFinishDelay() }`;
+    const objectDoc =`<a href="${href}">download</a>
+    <${"script"}> document.querySelector("a").click(); </${"script"}>`;
+
+    iframe.srcdoc = `<object data='data:text/html,${objectDoc}'></object>`;
+    iframe.sandbox = "allow-same-origin  allow-scripts allow-downloads";
+    iframe.addEventListener("load",()=>{
+        AssertDownloadSuccess(t, token, StreamDownloadFinishDelay() + DownloadVerifyDelay());
+    })
+    document.body.appendChild(iframe);
+}, "Navigation resulted download in sandbox from <object> is allowed by allow-downloads.");
+
+</script>
+</body>
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html
deleted file mode 100644
index 6b3b3104ef..0000000000
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_navigation_download_allow_downloads.sub.tentative.https.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Navigation resulted download in sandbox is allowed by allow-downloads.</title>
-<meta name="timeout" content="long" />
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-iframe-sandbox">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
-<script src="/resources/testharness.js"></script>
-<script src='/resources/testharnessreport.js'></script>
-<script src="support/iframe_sandbox_download_helper.js"></script>
-<body>
-<script>
-"use strict";
-
-async_test(t => {
-    const token = "{{$id:uuid()}}";
-    var iframe = document.createElement("iframe");
-    iframe.srcdoc = "<a>Download</a>";
-    iframe.sandbox = "allow-same-origin allow-downloads";
-    iframe.onload = t.step_func(function () {
-        iframe.contentWindow.addEventListener(
-            "unload", t.unreached_func("Unexpected navigation."));
-        var anchor = iframe.contentDocument.getElementsByTagName('a')[0];
-        // Set |finish-delay| to let the server stream a response over a  period
-        // of time, so it's able to catch potential download cancellation by
-        // detecting a socket close.
-        anchor.href = "support/download_stash.py?token=" + token + "&finish-delay=" + StreamDownloadFinishDelay();
-        anchor.click();
-        AssertDownloadSuccess(t, token, StreamDownloadFinishDelay() + DownloadVerifyDelay());
-    });
-
-    document.body.appendChild(iframe);
-}, "Navigation resulted download in sandbox is allowed by allow-downloads.");
-
-async_test(t => {
-    const token = "{{$id:uuid()}}";
-    var iframe = document.createElement("iframe");
-
-    const folder = location.origin+"/html/semantics/embedded-content/the-iframe-element/";
-    const href = `${folder}support/download_stash.py?token=${token}&finish-delay=${StreamDownloadFinishDelay() }`;
-    const objectDoc =`<a href="${href}">download</a>
-    <${"script"}> document.querySelector("a").click(); </${"script"}>`;
-
-    iframe.srcdoc = `<object data='data:text/html,${objectDoc}'></object>`;
-    iframe.sandbox = "allow-same-origin  allow-scripts allow-downloads";
-    iframe.addEventListener("load",()=>{
-        AssertDownloadSuccess(t, token, StreamDownloadFinishDelay() + DownloadVerifyDelay());
-    })
-    document.body.appendChild(iframe);
-}, "Navigation resulted download in sandbox from <object> is allowed by allow-downloads.");
-
-</script>
-</body>
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html
new file mode 100644
index 0000000000..158fc4f947
--- /dev/null
+++ b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Downloads triggered by window.open from sandbox are blocked.</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-iframe-sandbox">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
+<script src="/common/utils.js"></script>
+<script src="/resources/testharness.js"></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src="support/iframe_sandbox_download_helper.js"></script>
+<body>
+<script>
+"use strict";
+
+['', '"_blank"', '"_blank", "noopener"'].forEach(options =>
+  async_test(t => {
+    const download_token = token();
+    let iframe = document.createElement("iframe");
+    const download_link = `support/download_stash.py?token=${download_token}` +
+          `&finish-delay=${StreamDownloadFinishDelay()}`;
+    iframe.srcdoc = `<script>window.open("${download_link}", ${options})</scr` +
+      `ipt>`;
+    iframe.sandbox = "allow-same-origin allow-popups allow-scripts " +
+      "allow-downloads";
+    AssertDownloadSuccess(t, download_token, DownloadVerifyDelay());
+    document.body.appendChild(iframe);
+  }, `window.open(download, ${options}) triggering download in ` +
+             'sandbox is allowed by allow-downloads.'));
+</script>
+</body>
diff --git a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.https.html b/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.https.html
deleted file mode 100644
index 158fc4f947..0000000000
--- a/testing/web-platform/tests/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_window_open_download_allow_downloads.tentative.https.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Downloads triggered by window.open from sandbox are blocked.</title>
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-iframe-sandbox">
-<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-iframe-element">
-<script src="/common/utils.js"></script>
-<script src="/resources/testharness.js"></script>
-<script src='/resources/testharnessreport.js'></script>
-<script src="support/iframe_sandbox_download_helper.js"></script>
-<body>
-<script>
-"use strict";
-
-['', '"_blank"', '"_blank", "noopener"'].forEach(options =>
-  async_test(t => {
-    const download_token = token();
-    let iframe = document.createElement("iframe");
-    const download_link = `support/download_stash.py?token=${download_token}` +
-          `&finish-delay=${StreamDownloadFinishDelay()}`;
-    iframe.srcdoc = `<script>window.open("${download_link}", ${options})</scr` +
-      `ipt>`;
-    iframe.sandbox = "allow-same-origin allow-popups allow-scripts " +
-      "allow-downloads";
-    AssertDownloadSuccess(t, download_token, DownloadVerifyDelay());
-    document.body.appendChild(iframe);
-  }, `window.open(download, ${options}) triggering download in ` +
-             'sandbox is allowed by allow-downloads.'));
-</script>
-</body>
-- 
cgit v1.2.3