These two iframes should *both* render with scrollbars:
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-crossorigin-change.sub.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-crossorigin-change.sub.html
new file mode 100644
index 00000000000..13560324854
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/image-loading-lazy-crossorigin-change.sub.html
@@ -0,0 +1,30 @@
+
+
+ Deferred images with loading='lazy' use the latest crossorigin attribute
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/original-crossorigin-applied.sub.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/original-crossorigin-applied.sub.html
deleted file mode 100644
index 2cf076e75f7..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/original-crossorigin-applied.sub.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
- Deferred images with loading='lazy' use the original crossorigin attribute specified at the parse time
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/wpt/web-platform-tests/payment-handler/app-respond-with-minimal-ui.js b/tests/wpt/web-platform-tests/payment-handler/app-respond-with-minimal-ui.js
index 0e6b1b78b91..45ac57c2279 100644
--- a/tests/wpt/web-platform-tests/payment-handler/app-respond-with-minimal-ui.js
+++ b/tests/wpt/web-platform-tests/payment-handler/app-respond-with-minimal-ui.js
@@ -1,3 +1,18 @@
self.addEventListener('canmakepayment', event => {
+ if (!event.currency) {
+ event.respondWith(false);
+ return;
+ }
+
+ if (event.currency !== 'USD') {
+ event.respondWith(false);
+ return;
+ }
+
+ if (!event.respondWithMinimalUI) {
+ event.respondWith(false);
+ return;
+ }
+
event.respondWithMinimalUI(event.methodData[0].data.test);
});
diff --git a/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html b/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html
index d03032d0498..8e214cb6094 100644
--- a/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html
@@ -61,6 +61,8 @@ function testAbortShowIfDocumentIsNotActive() {
iframe,
"/payment-request/resources/page1.html"
);
+ // Save the DOMException of page1.html before navigating away.
+ const frameDOMException1 = iframe.contentWindow.DOMException;
// We navigate the iframe again, putting request1's document into an inactive state.
const request2 = await getLoadedPaymentRequest(
iframe,
@@ -71,6 +73,7 @@ function testAbortShowIfDocumentIsNotActive() {
await promise_rejects_dom(
t,
"AbortError",
+ frameDOMException1,
request1.show(),
"Inactive document, so must throw AbortError"
);
@@ -80,6 +83,7 @@ function testAbortShowIfDocumentIsNotActive() {
await promise_rejects_dom(
t,
"InvalidStateError",
+ iframe.contentWindow.DOMException,
request2.show(),
"Abort already called, so InvalidStateError"
);
@@ -112,6 +116,8 @@ function testAbortShowIfDocumentIsNotFullyActive() {
innerIframe,
"/payment-request/resources/page2.html"
);
+ // Save DOMException from innerIframe before navigating away.
+ const innerIframeDOMException = innerIframe.contentWindow.DOMException;
// Navigate the outer iframe to a new location.
// Wait for the load event to fire.
@@ -128,6 +134,7 @@ function testAbortShowIfDocumentIsNotFullyActive() {
await promise_rejects_dom(
t,
"AbortError",
+ innerIframeDOMException,
showPromise,
"Active, but not fully active, so must throw AbortError"
);
diff --git a/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html b/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html
index 6a721c32e68..7aba015e69b 100644
--- a/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html
+++ b/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html
@@ -12,7 +12,7 @@ promise_test(async (t) => {
portal.src = "resources/simple-portal.html";
hostWindow.document.body.appendChild(portal);
- await promise_rejects_dom(t, "InvalidStateError", portal.activate());
+ await promise_rejects_dom(t, "InvalidStateError", hostWindow.DOMException, portal.activate());
}, "about:blank cannot host a portal");
diff --git a/tests/wpt/web-platform-tests/portals/portal-activate-data.html b/tests/wpt/web-platform-tests/portals/portal-activate-data.html
index cefb0eae3dc..004fa97e55c 100644
--- a/tests/wpt/web-platform-tests/portals/portal-activate-data.html
+++ b/tests/wpt/web-platform-tests/portals/portal-activate-data.html
@@ -12,9 +12,9 @@ function nextMessage(target) {
});
}
-async function openPortalAndActivate(logic, activateOptions) {
+async function openPortalAndActivate(logic, activateOptions, testWindow) {
assert_precondition("HTMLPortalElement" in self);
- const w = await openBlankPortalHost();
+ const w = testWindow || await openBlankPortalHost();
try {
const portal = w.document.createElement('portal');
portal.src = new URL('resources/portal-activate-data-portal.html?logic=' + encodeURIComponent(logic), location.href);
@@ -71,9 +71,10 @@ promise_test(async () => {
}, "A message port can be passed through activate data.");
promise_test(async t => {
-await promise_rejects_dom(
- t, 'DataCloneError',
- openPortalAndActivate('', {data: new SharedArrayBuffer}));
+ const w = await openBlankPortalHost();
+ await promise_rejects_dom(
+ t, 'DataCloneError', w.DOMException,
+ openPortalAndActivate('', {data: new SharedArrayBuffer}, w));
}, "A SharedArrayBuffer cannot be passed through activate data.");
promise_test(async t => {
@@ -83,9 +84,10 @@ promise_test(async t => {
}, "Uncloneable data has its exception propagated.");
promise_test(async t => {
+ const w = await openBlankPortalHost();
await promise_rejects_js(
- t, TypeError,
- openPortalAndActivate('', {data: null, transfer: [null]}));
+ t, w.TypeError,
+ openPortalAndActivate('', {data: null, transfer: [null]}, w));
}, "Errors during transfer list processing are propagated.");
diff --git a/tests/wpt/web-platform-tests/portals/portals-activate-inside-iframe.html b/tests/wpt/web-platform-tests/portals/portals-activate-inside-iframe.html
index 5234babfdf9..587e483479c 100644
--- a/tests/wpt/web-platform-tests/portals/portals-activate-inside-iframe.html
+++ b/tests/wpt/web-platform-tests/portals/portals-activate-inside-iframe.html
@@ -13,7 +13,9 @@
document.body.appendChild(iframe);
await waitForLoad;
const portal = iframe.contentDocument.getElementById("portal");
- return promise_rejects_dom(t, "InvalidStateError", portal.activate());
+ return promise_rejects_dom(t, "InvalidStateError",
+ iframe.contentWindow.DOMException,
+ portal.activate());
}, "activating portal inside iframe should fail");
diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/web-platform-tests/resources/testharness.js
index 0ec232c1d27..ce043a287f7 100644
--- a/tests/wpt/web-platform-tests/resources/testharness.js
+++ b/tests/wpt/web-platform-tests/resources/testharness.js
@@ -638,11 +638,37 @@ policies and contribution forms [3].
});
}
+ /**
+ * Make a copy of a Promise in the current realm.
+ *
+ * @param {Promise} promise the given promise that may be from a different
+ * realm
+ * @returns {Promise}
+ *
+ * An arbitrary promise provided by the caller may have originated in
+ * another frame that have since navigated away, rendering the frame's
+ * document inactive. Such a promise cannot be used with `await` or
+ * Promise.resolve(), as microtasks associated with it may be prevented
+ * from being run. See https://github.com/whatwg/html/issues/5319 for a
+ * particular case.
+ *
+ * In functions we define here, there is an expectation from the caller
+ * that the promise is from the current realm, that can always be used with
+ * `await`, etc. We therefore create a new promise in this realm that
+ * inherit the value and status from the given promise.
+ */
+
+ function bring_promise_to_current_realm(promise) {
+ return new Promise(promise.then.bind(promise));
+ }
+
function promise_rejects_js(test, constructor, promise, description) {
- return promise.then(test.unreached_func("Should have rejected: " + description)).catch(function(e) {
- assert_throws_js_impl(constructor, function() { throw e },
- description, "promise_rejects_js");
- });
+ return bring_promise_to_current_realm(promise)
+ .then(test.unreached_func("Should have rejected: " + description))
+ .catch(function(e) {
+ assert_throws_js_impl(constructor, function() { throw e },
+ description, "promise_rejects_js");
+ });
}
/**
@@ -678,17 +704,21 @@ policies and contribution forms [3].
assert(maybeDescription === undefined,
"Too many args pased to no-constructor version of promise_rejects_dom");
}
- return promise.then(test.unreached_func("Should have rejected: " + description)).catch(function(e) {
- assert_throws_dom_impl(type, function() { throw e }, description,
- "promise_rejects_dom", constructor);
- });
+ return bring_promise_to_current_realm(promise)
+ .then(test.unreached_func("Should have rejected: " + description))
+ .catch(function(e) {
+ assert_throws_dom_impl(type, function() { throw e }, description,
+ "promise_rejects_dom", constructor);
+ });
}
function promise_rejects_exactly(test, exception, promise, description) {
- return promise.then(test.unreached_func("Should have rejected: " + description)).catch(function(e) {
- assert_throws_exactly_impl(exception, function() { throw e },
- description, "promise_rejects_exactly");
- });
+ return bring_promise_to_current_realm(promise)
+ .then(test.unreached_func("Should have rejected: " + description))
+ .catch(function(e) {
+ assert_throws_exactly_impl(exception, function() { throw e },
+ description, "promise_rejects_exactly");
+ });
}
/**
@@ -2808,24 +2838,8 @@ policies and contribution forms [3].
var message_port;
if (is_service_worker(worker)) {
- if (window.MessageChannel) {
- // The ServiceWorker's implicit MessagePort is currently not
- // reliably accessible from the ServiceWorkerGlobalScope due to
- // Blink setting MessageEvent.source to null for messages sent
- // via ServiceWorker.postMessage(). Until that's resolved,
- // create an explicit MessageChannel and pass one end to the
- // worker.
- var message_channel = new MessageChannel();
- message_port = message_channel.port1;
- message_port.start();
- worker.postMessage({type: "connect"}, [message_channel.port2]);
- } else {
- // If MessageChannel is not available, then try the
- // ServiceWorker.postMessage() approach using MessageEvent.source
- // on the other end.
- message_port = navigator.serviceWorker;
- worker.postMessage({type: "connect"});
- }
+ message_port = navigator.serviceWorker;
+ worker.postMessage({type: "connect"});
} else if (is_shared_worker(worker)) {
message_port = worker.port;
message_port.start();
diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html
new file mode 100644
index 00000000000..0cc4e12864e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html
@@ -0,0 +1,34 @@
+
+
+
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/original-crossorigin-applied.sub.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/original-crossorigin-applied.sub.html
deleted file mode 100644
index 2cf076e75f7..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/original-crossorigin-applied.sub.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
- 
-
diff --git a/tests/wpt/web-platform-tests/payment-handler/app-respond-with-minimal-ui.js b/tests/wpt/web-platform-tests/payment-handler/app-respond-with-minimal-ui.js
index 0e6b1b78b91..45ac57c2279 100644
--- a/tests/wpt/web-platform-tests/payment-handler/app-respond-with-minimal-ui.js
+++ b/tests/wpt/web-platform-tests/payment-handler/app-respond-with-minimal-ui.js
@@ -1,3 +1,18 @@
self.addEventListener('canmakepayment', event => {
+ if (!event.currency) {
+ event.respondWith(false);
+ return;
+ }
+
+ if (event.currency !== 'USD') {
+ event.respondWith(false);
+ return;
+ }
+
+ if (!event.respondWithMinimalUI) {
+ event.respondWith(false);
+ return;
+ }
+
event.respondWithMinimalUI(event.methodData[0].data.test);
});
diff --git a/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html b/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html
index d03032d0498..8e214cb6094 100644
--- a/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/rejects_if_not_active-manual.https.html
@@ -61,6 +61,8 @@ function testAbortShowIfDocumentIsNotActive() {
iframe,
"/payment-request/resources/page1.html"
);
+ // Save the DOMException of page1.html before navigating away.
+ const frameDOMException1 = iframe.contentWindow.DOMException;
// We navigate the iframe again, putting request1's document into an inactive state.
const request2 = await getLoadedPaymentRequest(
iframe,
@@ -71,6 +73,7 @@ function testAbortShowIfDocumentIsNotActive() {
await promise_rejects_dom(
t,
"AbortError",
+ frameDOMException1,
request1.show(),
"Inactive document, so must throw AbortError"
);
@@ -80,6 +83,7 @@ function testAbortShowIfDocumentIsNotActive() {
await promise_rejects_dom(
t,
"InvalidStateError",
+ iframe.contentWindow.DOMException,
request2.show(),
"Abort already called, so InvalidStateError"
);
@@ -112,6 +116,8 @@ function testAbortShowIfDocumentIsNotFullyActive() {
innerIframe,
"/payment-request/resources/page2.html"
);
+ // Save DOMException from innerIframe before navigating away.
+ const innerIframeDOMException = innerIframe.contentWindow.DOMException;
// Navigate the outer iframe to a new location.
// Wait for the load event to fire.
@@ -128,6 +134,7 @@ function testAbortShowIfDocumentIsNotFullyActive() {
await promise_rejects_dom(
t,
"AbortError",
+ innerIframeDOMException,
showPromise,
"Active, but not fully active, so must throw AbortError"
);
diff --git a/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html b/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html
index 6a721c32e68..7aba015e69b 100644
--- a/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html
+++ b/tests/wpt/web-platform-tests/portals/about-blank-cannot-host.html
@@ -12,7 +12,7 @@ promise_test(async (t) => {
portal.src = "resources/simple-portal.html";
hostWindow.document.body.appendChild(portal);
- await promise_rejects_dom(t, "InvalidStateError", portal.activate());
+ await promise_rejects_dom(t, "InvalidStateError", hostWindow.DOMException, portal.activate());
}, "about:blank cannot host a portal");
diff --git a/tests/wpt/web-platform-tests/portals/portal-activate-data.html b/tests/wpt/web-platform-tests/portals/portal-activate-data.html
index cefb0eae3dc..004fa97e55c 100644
--- a/tests/wpt/web-platform-tests/portals/portal-activate-data.html
+++ b/tests/wpt/web-platform-tests/portals/portal-activate-data.html
@@ -12,9 +12,9 @@ function nextMessage(target) {
});
}
-async function openPortalAndActivate(logic, activateOptions) {
+async function openPortalAndActivate(logic, activateOptions, testWindow) {
assert_precondition("HTMLPortalElement" in self);
- const w = await openBlankPortalHost();
+ const w = testWindow || await openBlankPortalHost();
try {
const portal = w.document.createElement('portal');
portal.src = new URL('resources/portal-activate-data-portal.html?logic=' + encodeURIComponent(logic), location.href);
@@ -71,9 +71,10 @@ promise_test(async () => {
}, "A message port can be passed through activate data.");
promise_test(async t => {
-await promise_rejects_dom(
- t, 'DataCloneError',
- openPortalAndActivate('', {data: new SharedArrayBuffer}));
+ const w = await openBlankPortalHost();
+ await promise_rejects_dom(
+ t, 'DataCloneError', w.DOMException,
+ openPortalAndActivate('', {data: new SharedArrayBuffer}, w));
}, "A SharedArrayBuffer cannot be passed through activate data.");
promise_test(async t => {
@@ -83,9 +84,10 @@ promise_test(async t => {
}, "Uncloneable data has its exception propagated.");
promise_test(async t => {
+ const w = await openBlankPortalHost();
await promise_rejects_js(
- t, TypeError,
- openPortalAndActivate('', {data: null, transfer: [null]}));
+ t, w.TypeError,
+ openPortalAndActivate('', {data: null, transfer: [null]}, w));
}, "Errors during transfer list processing are propagated.");