diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini new file mode 100644 index 00000000000..a9005e45d6e --- /dev/null +++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-charset.window.js.ini @@ -0,0 +1,8 @@ +[url-charset.window.html] + expected: TIMEOUT + [Blob charset should override any auto-detected charset.] + expected: TIMEOUT + + [Blob charset should override .] + expected: TIMEOUT + diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini index 76b44d9e9cf..3605e8f3fc9 100644 --- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini +++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini @@ -4,7 +4,7 @@ expected: TIMEOUT [Opening a blob URL in a new window immediately before revoking it works.] - expected: FAIL + expected: TIMEOUT [Fetching a blob URL immediately before revoking it works in an iframe.] expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini deleted file mode 100644 index f29da48a2a0..00000000000 --- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[hit-test-floats-003.html] - [Miss float below something else] - expected: FAIL - diff --git a/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini new file mode 100644 index 00000000000..93ffa116c99 --- /dev/null +++ b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-auto-last-word-001.html.ini @@ -0,0 +1,2 @@ +[hyphens-auto-last-word-001.html] + expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-punctuation-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-punctuation-001.html.ini new file mode 100644 index 00000000000..756c4be5011 --- /dev/null +++ b/tests/wpt/metadata-layout-2020/css/css-text/hyphens/hyphens-punctuation-001.html.ini @@ -0,0 +1,2 @@ +[hyphens-punctuation-001.html] + expected: FAIL diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini index 4a1e8110f6f..f8e7e539aae 100644 --- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini +++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini @@ -2,3 +2,6 @@ [Hit test intersecting scaled box] expected: FAIL + [Hit test within unscaled box] + expected: FAIL + diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini index c131078eace..23c61ede1a1 100644 --- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini +++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini @@ -17,3 +17,6 @@ [test the top of layer] expected: FAIL + [test some point of the element: top left corner] + expected: FAIL + diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini new file mode 100644 index 00000000000..e181af5397f --- /dev/null +++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini @@ -0,0 +1,4 @@ +[elementsFromPoint-invalid-cases.html] + [The root element is the last element returned for otherwise empty queries within the viewport] + expected: FAIL + diff --git a/tests/wpt/metadata-layout-2020/css/selectors/focus-in-focus-event-001.html.ini b/tests/wpt/metadata-layout-2020/css/selectors/focus-in-focus-event-001.html.ini index bef445ff6c0..81a52405f4f 100644 --- a/tests/wpt/metadata-layout-2020/css/selectors/focus-in-focus-event-001.html.ini +++ b/tests/wpt/metadata-layout-2020/css/selectors/focus-in-focus-event-001.html.ini @@ -1,2 +1,7 @@ [focus-in-focus-event-001.html] - expected: ERROR + [Checks that ':focus-visible' pseudo-class matches inside 'focus' event handler] + expected: FAIL + + [Checks that ':focus-within' pseudo-class matches inside 'focus' event handler] + expected: FAIL + diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini index 4ceef939a35..2dad0a40380 100644 --- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini +++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini @@ -312,18 +312,21 @@ [ - + @@ -10,6 +10,6 @@ import { testGetter } from "../resources/helpers.mjs"; // Even without the header, sandboxing makes this page have an opaque origin, -// so it is origin-isolated. +// so it is origin-keyed. testGetter(self, true); diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-no.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html similarity index 54% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html index b9a7359974d..a2220c5acc5 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html @@ -1,6 +1,6 @@ -window.originIsolated for a top-level frame sandboxed by CSP with an Origin-Isolation header +window.originAgentCluster for a top-level frame sandboxed by CSP with an Origin-Agent-Cluster header @@ -9,7 +9,7 @@ diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/csp-sandbox-yes.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-no.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html similarity index 70% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-no.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html index cb00ef782d0..06149cda8ab 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-no.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-no.https.html @@ -1,6 +1,6 @@ -window.originIsolated for a javascript: URL navigated to from a data: URL on a non-isolated page +window.originAgentCluster for a javascript: URL navigated to from a data: URL on a site-keyed page diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html similarity index 70% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html index 6856441deff..af6fea0ad97 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html @@ -1,6 +1,6 @@ -window.originIsolated for a javascript: URL navigated to from a data: URL on an isolated page +window.originAgentCluster for a javascript: URL navigated to from a data: URL on an origin-keyed page diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-to-javascript-yes.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-to-javascript-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-no.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html similarity index 77% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-no.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html index 5b194eaef35..8ae564a072a 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-no.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html @@ -1,6 +1,6 @@ -window.originIsolated for a data: URL on a non-isolated page +window.originAgentCluster for a data: URL on a site-keyed page diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html similarity index 75% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html index 85821be32b5..bcbf098a664 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html @@ -1,6 +1,6 @@ -window.originIsolationRestricted for a data: URL on an isolated page +window.originAgentCluster for a data: URL on an origin-keyed page diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/data-url-yes.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-no.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html similarity index 77% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-no.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html index b75cae47cdb..1b54ad42a43 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-no.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-no.https.html @@ -1,6 +1,6 @@ -window.originIsolated for a javascript: URL on a non-isolated page +window.originAgentCluster for a javascript: URL on a site-keyed page diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html similarity index 76% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html index 573b1a0b712..e2b7730dd2b 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html @@ -1,6 +1,6 @@ -window.originIsolated for a javascript: URL on an isolated page +window.originAgentCluster for a javascript: URL on an origin-keyed page diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/javascript-url-yes.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/javascript-url-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html similarity index 87% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html index 8a29076e561..fcf50689088 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html @@ -1,6 +1,6 @@ -window.originIsolated for a removed frame +window.originAgentCluster for a removed frame @@ -23,5 +23,5 @@ promise_test(async () => { assert_equals(frameWindow.originAgentCluster, true, "before"); iframe.remove(); assert_equals(frameWindow.originAgentCluster, true, "after"); -}, "Removing the iframe does not change originIsolated"); +}, "Removing the iframe does not change originAgentCluster"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/removed-iframe.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-to-javascript-test.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-to-javascript-test.mjs similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-to-javascript-test.mjs rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-to-javascript-test.mjs diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-url-test.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-url-test.mjs similarity index 84% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-url-test.mjs rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-url-test.mjs index d32d8521be4..1a9b3be47f6 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/data-url-test.mjs +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/data-url-test.mjs @@ -7,7 +7,7 @@ export default () => { }); // The data: URL iframe has an opaque origin, so it should return true, since - // for them site === origin so they are always "origin-isolated". + // for them site === origin so they are always origin-keyed. testGetter(0, true, "data: URL child"); }; diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/helpers.mjs similarity index 68% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/helpers.mjs index 6cc2ed6b697..4610ffcad0a 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/resources/helpers.mjs +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/resources/helpers.mjs @@ -1,8 +1,8 @@ import { waitForIframe } from "../../resources/helpers.mjs"; /** - * Inserts an iframe, not specialized for origin-isolation testing, pointing to - * a custom URL. This is just a wrapper to remove some boilerplate. + * Inserts an iframe, not specialized for origin-keyed agent cluster testing, + * pointing to a custom URL. This is just a wrapper to remove some boilerplate. * @param {string} src - The src="" value for the iframe */ export async function insertCustomIframe(src) { @@ -17,8 +17,7 @@ export async function insertCustomIframe(src) { } /** - * This is the part of send-origin-isolation-header.py that allows - * us to reuse testGetter. + * This is the part of send-oac-header.py that allows us to reuse testGetter. */ export const testSupportScript = ` diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html similarity index 75% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html index 5805d3421eb..5eb5d08d10f 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html @@ -1,6 +1,6 @@ -window.originIsolated for a sandboxed iframe on an isolated page +window.originAgentCluster for a sandboxed iframe on an origin-keyed page diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-iframe-yes.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-iframe-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-no.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html similarity index 74% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-no.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html index a1b44a1e5b3..3ed4096f399 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-no.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-no.https.html @@ -1,6 +1,6 @@ -window.originIsolated for a sandboxed, but same-origin, iframe on a non-isolated page +window.originAgentCluster for a sandboxed, but same-origin, iframe on a site-keyed page diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html similarity index 74% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html index b9339afae2e..c7ea5f06932 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html @@ -1,6 +1,6 @@ -window.originIsolated for a sandboxed, but same-origin, iframe on an isolated page +window.originAgentCluster for a sandboxed, but same-origin, iframe on an origin-keyed page diff --git a/tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html similarity index 75% rename from tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html index 7e95f193669..a593619ea64 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html @@ -1,6 +1,6 @@ -Parent is isolated, child1 is not isolated, child1 navigates to a different site, child2 gets inserted and is isolated, child1 navigates back +Parent is origin-keyed, child1 is site-keyed, child1 navigates to a different site, child2 gets inserted and is origin-keyed, child1 navigates back @@ -21,9 +21,9 @@ promise_setup(async () => { frame1 = await insertIframe("{{hosts[][www]}}"); }); -// Since they're different-origin, the parent's isolation request is respected, -// as is the child's non-request. So the parent ends up in the origin-keyed -// agent cluster and the child ends up in the site-keyed one. +// Since they're different-origin, the parent's origin-keying request is +// respected, as is the child's non-request. So the parent ends up in the +// origin-keyed agent cluster and the child ends up in the site-keyed one. testDifferentAgentClusters([self, 0], "Before navigation: parent to child1"); // Navigate the iframe to a different site. These, of course, must not be in the @@ -34,7 +34,7 @@ promise_test(async () => { }, "Navigation"); // Now insert a second iframe, pointing to the same place as the first one -// originally did, but this time with origin isolation enabled. Because of the +// originally did, but this time with origin-keying requested. Because of the // historical map of agent cluster keys for the browsing context group, the new // iframe should still end up in the site-keyed agent cluster. @@ -45,7 +45,7 @@ promise_test(async () => { testDifferentAgentClusters([self, 1], "After navigation: parent to child2"); // Now navigate the first iframe back. The resulting Document should be put in -// the site agent cluster, together with the second iframe's Document. +// the site-keyed agent cluster, together with the second iframe's Document. promise_test(async () => { const waitPromise = waitForIframe(frame1); diff --git a/tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/going-back.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/going-back.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html similarity index 77% rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html index 85ee2f677f3..8237f2f23f9 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html @@ -1,6 +1,6 @@ -Parent is not isolated, navigate a frame from same-origin non-isolated to different-origin (different-port) isolated +Parent is site-keyed, navigate a frame from same-origin site-keyed to different-origin (different-port) origin-keyed @@ -21,7 +21,7 @@ promise_setup(async () => { frame1 = await insertIframe("{{hosts[][]}}"); }); -// Nobody requested isolation yet. +// Nobody requested origin-keying yet. testSameAgentCluster([self, 0], "Before: parent to child"); testGetter(self, false, "before parent"); @@ -32,7 +32,8 @@ promise_test(async () => { await setBothDocumentDomains(frames[0]); }, "Navigation"); -// Since the new page is different-origin, it should be isolated. +// Since the new page is different-origin, its origin-keying request should be +// respected. testDifferentAgentClusters([self, 0], "After: parent to child"); testGetter(self, false, "after parent"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html similarity index 77% rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html index bb39de648ac..00d8c3164a6 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html @@ -1,6 +1,6 @@ -Parent is not isolated, navigate a frame from same-origin non-isolated to different-origin (subdomain) isolated +Parent is site-keyed, navigate a frame from same-origin site-keyed to different-origin (subdomain) origin-keyed @@ -21,7 +21,7 @@ promise_setup(async () => { frame1 = await insertIframe("{{hosts[][]}}"); }); -// Nobody requested isolation yet. +// Nobody requested origin-keying yet. testSameAgentCluster([self, 0], "Before: parent to child"); testGetter(self, false, "before parent"); @@ -32,7 +32,8 @@ promise_test(async () => { await setBothDocumentDomains(frames[0]); }, "Navigation"); -// Since the new page is different-origin, it should be isolated. +// Since the new page is different-origin, its origin-keying request should be +// respected. testDifferentAgentClusters([self, 0], "After: parent to child"); testGetter(self, false, "after parent"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html similarity index 74% rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html index b52ca783f6f..803e684e1ca 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html @@ -1,6 +1,6 @@ -Parent is not isolated, navigate a frame from a subdomain non-isolated to the same subdomain isolated +Parent is site-keyed, navigate a frame from a subdomain site-keyed to the same subdomain origin-keyed @@ -20,7 +20,7 @@ promise_setup(async () => { frame1 = await insertIframe("{{hosts[][www]}}"); }); -// Nobody requested isolation yet. +// Nobody requested origin-keying yet. testSameAgentCluster([self, 0], "Before: parent to child"); testGetter(self, false, "before parent"); @@ -31,8 +31,8 @@ promise_test(async () => { await setBothDocumentDomains(frames[0]); }, "Navigation"); -// Because this subdomain was previously non-isolated, the second load's -// isolation request is ignored; instead we continue isolating. +// Because this subdomain was previously site-keyed, the second load's +// origin-keying request is ignored; instead we continue with site-keying. testSameAgentCluster([self, 0], "After: parent to child"); testGetter(self, false, "after parent"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html similarity index 83% rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html index 67e99cee090..b96d10afd13 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html @@ -1,6 +1,6 @@ -Parent is not isolated, navigate a frame from a subdomain non-isolated to a second-subdomain isolated +Parent is site-keyed, navigate a frame from a subdomain site-keyed to a second-subdomain origin-keyed @@ -21,7 +21,7 @@ promise_setup(async () => { frame1 = await insertIframe("{{hosts[][www]}}"); }); -// Nobody requested isolation yet. +// Nobody requested origin-keying yet. testSameAgentCluster([self, 0], "Before: parent to child"); testGetter(self, false, "before parent"); @@ -33,7 +33,7 @@ promise_test(async () => { }, "Navigation"); // Because we're going to a different subdomain (and thus different origin), the -// isolation request is respected. +// origin-keying request is respected. testDifferentAgentClusters([self, 0], "After: parent to child"); testGetter(self, false, "after parent"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html similarity index 76% rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html index 1b7dd01947f..a70ed566708 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html @@ -1,6 +1,6 @@ -Parent is not isolated, navigate a frame from a subdomain isolated to a second-subdomain non-isolated +Parent is site-keyed, navigate a frame from a subdomain origin-keyed to a second-subdomain site-keyed @@ -21,7 +21,8 @@ promise_setup(async () => { frame1 = await insertIframe("{{hosts[][www]}}", "?1"); }); -// Since they are different-origin, the child's isolation request is respected. +// Since they are different-origin, the child's origin-keying request is +// respected. testDifferentAgentClusters([self, 0], "Before: parent to child"); testGetter(self, false, "before parent"); @@ -32,8 +33,9 @@ promise_test(async () => { await setBothDocumentDomains(frames[0]); }, "Navigation"); -// Make sure that the different-subdomain page (which doesn't request isolation) -// doesn't somehow get isolated just because its predecessor was. +// Make sure that the different-subdomain page (which doesn't request +// origin-keying) doesn't somehow get origin-keyed just because its predecessor +// was. testSameAgentCluster([self, 0], "After: parent to child"); testGetter(self, false, "after parent"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html similarity index 72% rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html index 783f5870a83..38e26301288 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html @@ -1,6 +1,6 @@ -Parent is not isolated, navigate a frame from a subdomain isolated to the same subdomain non-isolated +Parent is site-keyed, navigate a frame from a subdomain origin-keyed to the same subdomain site-keyed @@ -20,7 +20,8 @@ promise_setup(async () => { frame1 = await insertIframe("{{hosts[][www]}}", "?1"); }); -// Since they are different-origin, the child's isolation request is respected. +// Since they are different-origin, the child's origin-keying request is +// respected. testDifferentAgentClusters([self, 0], "Before: parent to child"); testGetter(self, false, "before parent"); @@ -31,8 +32,8 @@ promise_test(async () => { await setBothDocumentDomains(frames[0]); }, "Navigation"); -// Because this subdomain was previously isolated, the second load's -// non-isolation request is ignored; instead we continue isolating. +// Because this subdomain was previously origin-keyed, the second load's +// non-request is ignored; instead we continue origin-keying. testDifferentAgentClusters([self, 0], "After: parent to child"); testGetter(self, false, "after parent"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html similarity index 79% rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html index 461fd0ddc4b..6211845be1f 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html @@ -1,6 +1,6 @@ -Parent is isolated, navigate a frame from same-origin non-isolated to different-origin (different-port) isolated +Parent is origin-keyed, navigate a frame from same-origin site-keyed to different-origin (different-port) origin-keyed @@ -21,8 +21,8 @@ promise_setup(async () => { frame1 = await insertIframe("{{hosts[][]}}"); }); -// Since the parent is isolated, the same-origin child's non-request is ignored, -// so it gets isolated too. +// Since the parent is origin-keyed, the same-origin child's non-request is +// ignored, so it gets origin-keyed too. testSameAgentCluster([self, 0], "Before: parent to child"); testGetter(self, true, "before parent"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-port.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html similarity index 79% rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html index 6832cd03858..ead56754a70 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html @@ -1,6 +1,6 @@ -Parent is isolated, navigate a frame from same-origin non-isolated to different-origin (subdomain) isolated +Parent is origin-keyed, navigate a frame from same-origin site-keyed to different-origin (subdomain) origin-keyed @@ -21,8 +21,8 @@ promise_setup(async () => { frame1 = await insertIframe("{{hosts[][]}}"); }); -// Since the parent is isolated, the same-origin child's non-request is ignored, -// so it gets isolated too. +// Since the parent is origin-keyed, the same-origin child's non-request is +// ignored, so it gets origin-keyed too. testSameAgentCluster([self, 0], "Before: parent to child"); testGetter(self, true, "before parent"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html similarity index 71% rename from tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html index 18e0216e262..6f9e5d8b73a 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html @@ -1,6 +1,6 @@ -Parent requests isolation, child requests isolation, child is a subdomain of the parent, but all over insecure HTTP +Parent requests origin-keying, child requests origin-keying, child is a subdomain of the parent, but all over insecure HTTP @@ -17,7 +17,7 @@ promise_setup(async () => { await insertIframe("{{hosts[][www]}}", "?1"); }); -// All isolation requests are ignored, since this is over insecure HTTP. +// All origin-keying requests are ignored, since this is over insecure HTTP. // So both end up in the site-keyed agent cluster. testSameAgentCluster([self, 0]); diff --git a/tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/insecure-http.sub.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/insecure-http.sub.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups-crash.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups-crash.https.html similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/popups-crash.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups-crash.https.html diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html similarity index 64% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-port.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html index 270162530b1..a0bf569b124 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-port.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html @@ -1,6 +1,6 @@ -Opener is not isolated, openee is isolated, openee is different-origin to the opener because of a port mismatch +Opener is site-keyed, openee is origin-keyed, openee is different-origin to the opener because of a port mismatch @@ -18,9 +18,9 @@ promise_setup(async () => { openee = await openWindow("{{hosts[][]}}:{{ports[https][1]}}", "?1"); }); -// Since they're different-origin, the openee's isolation request is respected, -// so the opener ends up in the site-keyed agent cluster and the openee in the -// origin-keyed one. +// Since they're different-origin, the openee's origin-keying request is +// respected, so the opener ends up in the site-keyed agent cluster and the +// openee in the origin-keyed one. testOpenedWindowIsInADifferentAgentCluster(() => openee); testGetter(self, false, "opener"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-same.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html similarity index 68% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-same.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html index 0c8d89b8e66..196dff1449b 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-same.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html @@ -1,6 +1,6 @@ -Opener is not isolated, openee is isolated, openee is same-origin to the opener +Opener is site-keyed, openee is origin-keyed, openee is same-origin to the opener @@ -18,8 +18,8 @@ promise_setup(async () => { openee = await openWindow("{{hosts[][]}}", "?1"); }); -// Since they're same-origin, and the opener loaded without isolation, the -// child's request for isolation gets ignored, and both end up site-keyed. +// Since they're same-origin, and the opener loaded with site-keying, the +// child's request for origin-keying gets ignored, and both end up site-keyed. testOpenedWindowIsInSameAgentCluster(() => openee); testGetter(self, false, "opener"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html similarity index 66% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-subdomain.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html index d1aaabd9206..f96d2273d5e 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-no-openee-yes-subdomain.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html @@ -1,6 +1,6 @@ -Opener is not isolated, openee is isolated, openee is a subdomain of the opener +Opener is site-keyed, openee is origin-keyed, openee is a subdomain of the opener @@ -18,9 +18,9 @@ promise_setup(async () => { openee = await openWindow("{{hosts[][www]}}", "?1"); }); -// Since they're different-origin, the openee's isolation request is respected, -// so the opener ends up in the site-keyed agent cluster and the openee in the -// origin-keyed one. +// Since they're different-origin, the openee's origin-keying request is +// respected, so the opener ends up in the site-keyed agent cluster and the +// openee in the origin-keyed one. testOpenedWindowIsInADifferentAgentCluster(() => openee); testGetter(self, false, "opener"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html similarity index 64% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html index 96b839e167f..51c5a208c5e 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html @@ -1,6 +1,6 @@ -Opener is isolated, openee is not isolated, openee is different-origin to the opener because of a port mismatch +Opener is origin-keyed, openee is site-keyed, openee is different-origin to the opener because of a port mismatch @@ -18,9 +18,9 @@ promise_setup(async () => { openee = await openWindow("{{hosts[][]}}:{{ports[https][1]}}"); }); -// Since they're different-origin, the openee's isolation non-request is -// respected, so the opener ends up in the origin-keyed agent cluster and the -// openee in the site-keyed one. +// Since they're different-origin, the openee's non-request is respected, so the +// opener ends up in the origin-keyed agent cluster and the openee in the +// site-keyed one. testOpenedWindowIsInADifferentAgentCluster(() => openee); testGetter(self, true, "opener"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-port.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-port.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html similarity index 70% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html index 0dee5fae002..562ab40c68b 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html @@ -1,6 +1,6 @@ -Opener is isolated, openee is not isolated, openee is same-origin to the opener +Opener is origin-keyed, openee is site-keyed, openee is same-origin to the opener @@ -18,8 +18,8 @@ promise_setup(async () => { openee = await openWindow("{{hosts[][]}}"); }); -// Since they're same-origin, the openee's isolation non-request is ignored, -// so both end up in the origin-keyed agent cluster. +// Since they're same-origin, the openee's non-request is ignored, so both end +// up in the origin-keyed agent cluster. testOpenedWindowIsInSameAgentCluster(() => openee); testGetter(self, true, "opener"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-same.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-same.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html similarity index 66% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html index cfec0fda130..d7d4791459e 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html @@ -1,6 +1,6 @@ -Opener is isolated, openee is not isolated, openee is a subdomain of the opener +Opener is origin-keyed, openee is site-keyed, openee is a subdomain of the opener @@ -18,9 +18,9 @@ promise_setup(async () => { openee = await openWindow("{{hosts[][www]}}"); }); -// Since they're different-origin, the openee's isolation non-request is -// respected, so the opener ends up in the origin-keyed agent cluster and the -// openee in the site-keyed one. +// Since they're different-origin, the openee's non-request is respected, so the +// opener ends up in the origin-keyed agent cluster and the openee in the +// site-keyed one. testOpenedWindowIsInADifferentAgentCluster(() => openee); testGetter(self, true, "opener"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-no-subdomain.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-no-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html similarity index 77% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html index 4ea37421df0..32a5066d2ee 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html @@ -1,6 +1,6 @@ -Opener is isolated, openee is isolated, openee is different-origin to the opener because of a port mismatch +Opener is origin-keyed, openee is origin-keyed, openee is different-origin to the opener because of a port mismatch @@ -18,7 +18,7 @@ promise_setup(async () => { openee = await openWindow("{{hosts[][]}}:{{ports[https][1]}}", "?1"); }); -// Both request isolation, so the opener ends up in one origin-keyed agent +// Both request origin-keying, so the opener ends up in one origin-keyed agent // cluster (the default port's origin), and the openee ends up in a different // origin-keyed agent cluster (the other port's origin). testOpenedWindowIsInADifferentAgentCluster(() => openee); diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-port.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-port.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html similarity index 71% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html index 603f11d8de6..a85decac3c1 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html @@ -1,6 +1,6 @@ -Opener is isolated, openee is isolated, openee is same-origin to the opener +Opener is origin-keyed, openee is origin-keyed, openee is same-origin to the opener @@ -18,8 +18,8 @@ promise_setup(async () => { openee = await openWindow("{{hosts[][]}}", "?1"); }); -// Both request isolation, and they're same-origin, so they both end up in the -// same origin-keyed agent cluster. +// Both request origin-keying, and they're same-origin, so they both end up in +// the same origin-keyed agent cluster. testOpenedWindowIsInSameAgentCluster(() => openee); testGetter(self, true, "opener"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-same.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html similarity index 79% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html index b182d496a92..148b39af232 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html @@ -1,6 +1,6 @@ -Opener is isolated, openee is isolated, openee is a subdomain of the opener +Opener is origin-keyed, openee is origin-keyed, openee is a subdomain of the opener @@ -18,7 +18,7 @@ promise_setup(async () => { openee = await openWindow("{{hosts[][www]}}", "?1"); }); -// Both request isolation, so the opener ends up in one origin-keyed agent +// Both request origin-keyed, so the opener ends up in one origin-keyed agent // cluster (the base domain's origin), and the openee ends up in a different // origin-keyed agent cluster (the www subdomain's origin). testOpenedWindowIsInADifferentAgentCluster(() => openee); diff --git a/tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html similarity index 68% rename from tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html index cbe13af8207..b83aa9f5bed 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html @@ -1,6 +1,6 @@ -A non-isolated child at a given origin causes future children to also be non-isolated even after the iframe is removed +A site-keyed child at a given origin causes future children to also be site-keyed even after the iframe is removed @@ -19,9 +19,9 @@ promise_setup(async () => { frame1 = await insertIframe("{{hosts[][www]}}"); }); -// Since they're different-origin, the parent's isolation request is respected, -// as is the child's non-request. So the parent ends up in the origin-keyed -// agent cluster and the child ends up in the site-keyed one. +// Since they're different-origin, the parent's origin-keying request is +// respected, as is the child's non-request. So the parent ends up in the +// origin-keyed agent cluster and the child ends up in the site-keyed one. testDifferentAgentClusters([self, 0], "Before"); testGetter(self, true, "parent"); testGetter(0, false, "child1"); @@ -33,8 +33,8 @@ promise_test(async () => { await insertIframe("{{hosts[][www1]}}"); }, "Remove the iframe and insert new ones"); -// Because of the historical presence of a non-isolated {{hosts[][www]}} iframe, -// the origin isolation request for child 2 will be ignored. So, +// Because of the historical presence of a site-keyed {{hosts[][www]}} iframe, +// the origin-keying request for child 2 will be ignored. So, // child 2 and child 3 both end up in the site-keyed agent cluster. testDifferentAgentClusters([self, 0], "Parent to child2"); testDifferentAgentClusters([self, 1], "Parent to child3"); diff --git a/tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/removing-iframes.sub.https.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/removing-iframes.sub.https.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/README.md b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/README.md similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/resources/README.md rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/README.md diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html new file mode 100644 index 00000000000..45c8d5074d2 --- /dev/null +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html @@ -0,0 +1,6 @@ + + +This page helps exhibit a crash bug when window.open()ed (see ../popups-crash.https.html) + + + diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/resources/crashy-popup.sub.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/crashy-popup.sub.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/frame.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/resources/frame.html rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/frame.html.headers b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html.headers similarity index 100% rename from tests/wpt/web-platform-tests/origin-isolation/resources/frame.html.headers rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/frame.html.headers diff --git a/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs similarity index 85% rename from tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs rename to tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs index 02ba405c601..f858c5fefbc 100644 --- a/tests/wpt/web-platform-tests/origin-isolation/resources/helpers.mjs +++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-keyed-agent-clusters/resources/helpers.mjs @@ -1,15 +1,15 @@ /** - * Inserts an iframe usable for origin isolation testing, and returns a promise - * fulfilled when the iframe is loaded and its document.domain is set. The - * iframe will point to the send-origin-isolation-header.py file, on the - * designated host + * Inserts an iframe usable for origin-keyed agent cluster testing, and returns + * a promise fulfilled when the iframe is loaded and its document.domain is set. + * The iframe will point to the send-oac-header.py file, on the designated + * host. * @param {string} host - The host used to calculate the iframe's src="" - * @param {string=} header - The value of the Origin-Isolation header that the - * iframe will set. Omit this to set no header. + * @param {string=} header - The value of the Origin-Agent-Cluster header that + * the iframe will set. Omit this to set no header. * @param {object=} options - Rarely-used options. * @param {boolean=} options.redirectFirst - Whether to do a 302 redirect first - * before arriving at the isolated page. The redirecting page will not set - * the Origin-Isolation header. + * before arriving at the page that sets the header. The redirecting page will + * not set the Origin-Agent-Cluster header. * @returns {HTMLIFrameElement} The created iframe element */ export async function insertIframe(host, header, { redirectFirst = false } = {}) { @@ -22,16 +22,16 @@ export async function insertIframe(host, header, { redirectFirst = false } = {}) } /** - * Navigates an iframe to a page for origin isolation testing, similar to - * insertIframe but operating on an existing iframe. + * Navigates an iframe to a page for origin-keyed agent cluster testing, similar + * to insertIframe but operating on an existing iframe. * @param {HTMLIFrameElement} iframeEl - The - diff --git a/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain.html b/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain.html index 45564e1bfac..b14b7e4f8a9 100644 --- a/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain.html +++ b/tests/wpt/web-platform-tests/preload/avoid-prefetching-on-text-plain.html @@ -16,11 +16,9 @@ window.addEventListener("message", function(msg) { // Parse the Performance API data passed from the plain text iframe. const entries = JSON.parse(msg.data); - const urls = []; const resource_types = []; for (const entry of entries) { resource_types.push(entry.entryType); - urls.push(entry.name); } // If preloading is working correctly, should only see the text document // represented in the performance information. A 'resource' type indicates @@ -33,8 +31,6 @@ } } assert_false(resource_found, "no resources should be present"); - assert_equals(urls.length, 1); - assert_equals(urls[0].endsWith("avoid-prefetching-on-text-plain-inner.html"), true); done(); }); prefetchingIframe.addEventListener('load', function() { diff --git a/tests/wpt/web-platform-tests/scroll-animations/current-time.html b/tests/wpt/web-platform-tests/scroll-animations/current-time.html index cbe2d8d6005..fe8c64a6add 100644 --- a/tests/wpt/web-platform-tests/scroll-animations/current-time.html +++ b/tests/wpt/web-platform-tests/scroll-animations/current-time.html @@ -463,86 +463,4 @@ promise_test(async t => { assert_equals(scrollTimeline.currentTime, scrollTimeline.timeRange); }, 'currentTime handles startScrollOffset > endScrollOffset correctly'); -promise_test(async t => { - const scroller = setupScrollTimelineTest(); - // Set the timeRange such that currentTime maps directly to the value - // scrolled. The contents and scroller are square, so it suffices to compute - // one edge and use it for all the timelines. - const scrollerSize = scroller.scrollHeight - scroller.clientHeight; - - const scrollTimeline = new ScrollTimeline({ - scrollSource: scroller, - timeRange: scrollerSize, - orientation: 'block', - scrollOffsets: [CSS.px(10), CSS.px(20), CSS.px(40), CSS.px(70), CSS.px(90)], - }); - - var offset = 0; - var w = 1 / 4; // offset weight - var p = 0; // progress within the offset - - scroller.scrollTop = 10; - assert_times_equal( - scrollTimeline.currentTime, (offset + p) * w * scrollerSize, - "current time calculation when scroll = " + scroller.scrollTop); - - p = (12 - 10) / (20 - 10); - scroller.scrollTop = 12; - await waitForNextFrame(); - assert_times_equal( - scrollTimeline.currentTime, (offset + p) * w * scrollerSize, - "current time calculation when scroll = " + scroller.scrollTop); - - offset = 1; - p = 0; - scroller.scrollTop = 20; - await waitForNextFrame(); - assert_times_equal( - scrollTimeline.currentTime, (offset + p) * w * scrollerSize, - "current time calculation when scroll = " + scroller.scrollTop); - - p = (35 - 20) / (40 - 20); - scroller.scrollTop = 35; - await waitForNextFrame(); - assert_times_equal( - scrollTimeline.currentTime, (offset + p) * w * scrollerSize, - "current time calculation when scroll = " + scroller.scrollTop); - - offset = 2; - p = 0; - scroller.scrollTop = 40; - await waitForNextFrame(); - assert_times_equal( - scrollTimeline.currentTime, (offset + p) * w * scrollerSize, - "current time calculation when scroll = " + scroller.scrollTop); - - p = (60 - 40) / (70 - 40); - scroller.scrollTop = 60; - await waitForNextFrame(); - assert_times_equal( - scrollTimeline.currentTime, (offset + p) * w * scrollerSize, - "current time calculation when scroll = " + scroller.scrollTop); - - offset = 3; - p = 0; - scroller.scrollTop = 70; - await waitForNextFrame(); - assert_times_equal( - scrollTimeline.currentTime, (offset + p) * w * scrollerSize, - "current time calculation when scroll = " + scroller.scrollTop); - - p = (80 - 70) / (90 - 70); - scroller.scrollTop = 80; - await waitForNextFrame(); - assert_times_equal( - scrollTimeline.currentTime, (offset + p) * w * scrollerSize, - "current time calculation when scroll = " + scroller.scrollTop); - - scroller.scrollTop = 90; - await waitForNextFrame(); - assert_times_equal( - scrollTimeline.currentTime, scrollerSize, - "current time calculation when scroll = " + scroller.scrollTop); -}, 'currentTime calculations when multiple scroll offsets are specified'); - diff --git a/tests/wpt/web-platform-tests/scroll-animations/multiple-scroll-offsets.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/multiple-scroll-offsets.tentative.html new file mode 100644 index 00000000000..026b2e7673c --- /dev/null +++ b/tests/wpt/web-platform-tests/scroll-animations/multiple-scroll-offsets.tentative.html @@ -0,0 +1,143 @@ + + +ScrollTimeline current time algorithm + + + + + + + + + diff --git a/tests/wpt/web-platform-tests/svg/animations/use-animate-display-none-symbol.html b/tests/wpt/web-platform-tests/svg/animations/use-animate-display-none-symbol.html new file mode 100644 index 00000000000..6ae10ca8739 --- /dev/null +++ b/tests/wpt/web-platform-tests/svg/animations/use-animate-display-none-symbol.html @@ -0,0 +1,16 @@ + + +Animate a symbol in a display: none subtree + + + + + + + + + + + + diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py index d4472811e59..2b5ed4a27d5 100644 --- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py +++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py @@ -429,7 +429,7 @@ class Http2WebTestRequestHandler(BaseWebTestRequestHandler): return False method = extract_method_header(frame.headers) - if method != "CONNECT": + if method != b"CONNECT": return False protocol = "" @@ -437,7 +437,7 @@ class Http2WebTestRequestHandler(BaseWebTestRequestHandler): if key in (b':protocol', u':protocol'): protocol = isomorphic_encode(value) break - if protocol != "websocket": + if protocol != b"websocket": raise ProtocolError("Invalid protocol %s with CONNECT METHOD" % (protocol,)) return True diff --git a/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html b/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html index e3e4a2635e9..f6b9798f502 100644 --- a/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html +++ b/tests/wpt/web-platform-tests/trusted-types/Node-multiple-arguments.tentative.html @@ -8,6 +8,7 @@