From 26a029d407be480d791972afb5975cf62c9360a6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 02:47:55 +0200
Subject: Adding upstream version 124.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 ...-writable_unlocked_on_tab_close.https.window.js | 70 ++++++++++++++++++++++
 .../fs-open_writable_after_trigger.sub.html        | 45 ++++++++++++++
 .../fs-open_writable_then_close_tab.sub.html       | 20 +++++++
 .../mozilla/tests/dom/fs/support/testHelpers.js    | 15 +++++
 4 files changed, 150 insertions(+)
 create mode 100644 testing/web-platform/mozilla/tests/dom/fs/fs-writable_unlocked_on_tab_close.https.window.js
 create mode 100644 testing/web-platform/mozilla/tests/dom/fs/support/fs-open_writable_after_trigger.sub.html
 create mode 100644 testing/web-platform/mozilla/tests/dom/fs/support/fs-open_writable_then_close_tab.sub.html
 create mode 100644 testing/web-platform/mozilla/tests/dom/fs/support/testHelpers.js

(limited to 'testing/web-platform/mozilla/tests/dom/fs')

diff --git a/testing/web-platform/mozilla/tests/dom/fs/fs-writable_unlocked_on_tab_close.https.window.js b/testing/web-platform/mozilla/tests/dom/fs/fs-writable_unlocked_on_tab_close.https.window.js
new file mode 100644
index 0000000000..6e8192aaef
--- /dev/null
+++ b/testing/web-platform/mozilla/tests/dom/fs/fs-writable_unlocked_on_tab_close.https.window.js
@@ -0,0 +1,70 @@
+// META: title=Origin private file system used from multiple tabs
+// META: script=support/testHelpers.js
+
+promise_test(async t => {
+  const bc = new BroadcastChannel("Coordinate writables");
+
+  function firstReady(win) {
+    return new Promise(resolve => {
+      // Blur triggers after the unload event and after window.closed is set
+      win.onblur = () => {
+        // Closing the low-level file handle may get stuck, but the unlocking
+        // request can only be sent to the parent after the handle is closed.
+        // There is no guarantee when or if the closing will be complete.
+        //
+        // Therefore, the content process shutdown does not wait for the
+        // completion but sets window.closed and calls the unload listeners
+        // while actually still holding onto some resources.
+        //
+        // Since in this test we mainly want to ensure that a file
+        // does not remain locked indefinitely, we wait for a reasonable amount
+        // of time before creating a new writable, corresponding roughly to
+        // a 500ms closing delay.
+        const timeoutMs = 400;
+        setTimeout(() => {
+          resolve(win);
+        }, timeoutMs);
+      };
+    });
+  }
+
+  const firstTabName = "support/fs-open_writable_then_close_tab.sub.html";
+  const firstTab = await firstReady(window.open(firstTabName));
+  assert_true(firstTab.closed, "Is the first tab already closed?");
+
+  function secondReady(win) {
+    return new Promise(resolve => {
+      bc.onmessage = e => {
+        if (e.data === "Second window ready!") {
+          resolve(win);
+        }
+      };
+    });
+  }
+
+  const secondTabName = "support/fs-open_writable_after_trigger.sub.html";
+  const secondTab = await secondReady(window.open(secondTabName));
+
+  let isDone = false;
+  let childStatus = "Success";
+
+  const secondSucceeded = new Promise(resolve => {
+    bc.onmessage = e => {
+      isDone = true;
+      if (e.data !== "Success") {
+        childStatus = e.data;
+      }
+
+      resolve();
+    };
+  });
+
+  bc.postMessage("Create writable in the second window");
+
+  await secondSucceeded;
+  assert_true(isDone, "Did the second tab respond?");
+
+  await fetch_tests_from_window(secondTab);
+
+  assert_equals(childStatus, "Success");
+}, `writable available for other tabs after one tab is closed`);
diff --git a/testing/web-platform/mozilla/tests/dom/fs/support/fs-open_writable_after_trigger.sub.html b/testing/web-platform/mozilla/tests/dom/fs/support/fs-open_writable_after_trigger.sub.html
new file mode 100644
index 0000000000..b64d97083f
--- /dev/null
+++ b/testing/web-platform/mozilla/tests/dom/fs/support/fs-open_writable_after_trigger.sub.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<title>Child context test(s)</title>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="testHelpers.js"></script>
+</head>
+<body>
+  <div id="log"></div>
+  <script>
+    const channel = new BroadcastChannel("Coordinate writables");
+
+    let triggered = false;
+
+    channel.onmessage = e => {
+      if ("Create writable in the second window" === e.data) {
+        triggered = true;
+      }
+    };
+
+    channel.postMessage("Second window ready!");
+
+    promise_test(async t => {
+      try {
+        const maxWaitMs = 2000;
+        await waitUntil(() => { return triggered; }, maxWaitMs);
+        assert_true(triggered, "Did we receive a trigger?");
+
+        const dir = await navigator.storage.getDirectory();
+        const opts = { create: true };
+        const file = await dir.getFileHandle('funky-file-handle', opts);
+        let writable = await file.createWritable({});
+        t.add_cleanup(async () => { await writable.close(); });
+        assert_true(!!writable, "Did we receive a writable?");
+
+        channel.postMessage("Success");
+      } catch(err) {
+        channel.postMessage(err.message);
+
+        throw err;
+      }
+    });
+  </script>
+</body>
+</html>
diff --git a/testing/web-platform/mozilla/tests/dom/fs/support/fs-open_writable_then_close_tab.sub.html b/testing/web-platform/mozilla/tests/dom/fs/support/fs-open_writable_then_close_tab.sub.html
new file mode 100644
index 0000000000..098fe83b1f
--- /dev/null
+++ b/testing/web-platform/mozilla/tests/dom/fs/support/fs-open_writable_then_close_tab.sub.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<title>Child context test(s)</title>
+<head>
+  <script src="/resources/testharness.js"></script>
+</head>
+<body>
+  <div id="log"></div>
+  <script>
+    window.addEventListener('load', async () => {
+      const dir = await navigator.storage.getDirectory();
+      const opts = { create: true };
+      const file = await dir.getFileHandle('funky-file-handle', opts);
+      const writable = await file.createWritable({});
+
+      window.close();
+    });
+  </script>
+</body>
+</html>
diff --git a/testing/web-platform/mozilla/tests/dom/fs/support/testHelpers.js b/testing/web-platform/mozilla/tests/dom/fs/support/testHelpers.js
new file mode 100644
index 0000000000..5cf47435c1
--- /dev/null
+++ b/testing/web-platform/mozilla/tests/dom/fs/support/testHelpers.js
@@ -0,0 +1,15 @@
+async function waitUntil(isWaitDone, untilMs, stepMs = 25) {
+  const startMs = Date.now();
+
+  return new Promise((resolve, reject) => {
+      const areWeDoneYet = setInterval(async function() {
+        if (await isWaitDone()) {
+          clearInterval(areWeDoneYet);
+          resolve();
+        } else if (Date.now() > startMs + untilMs) {
+          clearInterval(areWeDoneYet);
+          reject(new Error("Timed out after " + untilMs + "ms"));
+        }
+      }, stepMs);
+  });
+}
-- 
cgit v1.2.3