From 7289e837fdbafa296166a68cf38eed5d89ae89d8 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Sat, 23 Nov 2019 08:37:37 +0000
Subject: [PATCH] Update web-platform-tests to revision
 f0cb9071aea5ce5b641fcba5f362a0796bdc70bc

---
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 .../FileAPI/url/url-with-fetch.any.js.ini     |    3 -
 tests/wpt/metadata/MANIFEST.json              | 2949 ++++++++++-------
 .../floats-in-table-caption-001.html.ini      |    2 +
 .../line-height-interpolation.html.ini        |    2 +
 .../css/CSS2/text/white-space-002.xht.ini     |    2 -
 .../css/CSS2/text/white-space-003.xht.ini     |    2 -
 .../css/CSS2/visudet/line-height-204.html.ini |    2 -
 .../mix-blend-mode-paragraph.html.ini         |    2 -
 .../background-image-interpolation.html.ini   |    2 +
 .../background-repeat-round-roundup.xht.ini   |    2 -
 .../standard-font-family-11.html.ini          |    2 +
 .../standard-font-family-12.html.ini          |    2 +
 .../standard-font-family-13.html.ini          |    2 +
 .../standard-font-family-14.html.ini          |    2 +
 .../standard-font-family-15.html.ini          |    2 +
 .../standard-font-family-16.html.ini          |    2 +
 .../at-font-face-font-matching.html.ini       |    3 +
 .../hyphens/hyphens-out-of-flow-001.html.ini  |    2 +
 .../line-break/line-break-normal-018.xht.ini  |    2 +
 .../line-break/line-break-strict-018.xht.ini  |    2 +
 ...text-transform-full-size-kana-001.html.ini |    2 +
 ...text-transform-full-size-kana-002.html.ini |    2 +
 ...text-transform-full-size-kana-003.html.ini |    2 +
 ...text-transform-full-size-kana-004.html.ini |    2 +
 .../trailing-ideographic-space-004.html.ini   |    2 +
 .../word-break-break-all-007.html.ini         |    2 -
 .../word-break-keep-all-006.html.ini          |    2 -
 ...nsforms-3d-on-anonymous-block-001.html.ini |    2 -
 .../vertical-align-interpolation.html.ini     |    2 +
 .../animations/z-index-interpolation.html.ini |    2 +
 ...on-from-ua-to-blocking-stylesheet.html.ini |    2 +-
 .../elementFromPoint-list-001.html.ini        |    3 +
 .../elementsFromPoint-iframes.html.ini        |    1 -
 .../offsetTopLeft-border-box.html.ini         |    7 -
 ...View-horizontal-partially-visible.html.ini |    4 +
 .../contentType/contenttype_html.html.ini     |    2 +
 .../contentType/contenttype_txt.html.ini      |    2 +
 .../contentType/contenttype_xml.html.ini      |    2 +
 .../encoding/single-byte-decoder.html.ini     |    1 +
 .../fetch/content-type/response.window.js.ini |   17 +-
 .../fetch/content-type/script.window.js.ini   |    3 -
 .../fetch.tentative.https.sub.html.ini        |   48 +-
 .../metadata/fetch.tentative.sub.html.ini     |    8 +-
 .../history.tentative.https.sub.html.ini      |   32 +-
 .../metadata/iframe.tentative.sub.html.ini    |    8 +-
 .../metadata/img.tentative.https.sub.html.ini |   24 +-
 ...site-redirect.tentative.https.sub.html.ini |   24 +-
 ...ct-cross-site.tentative.https.sub.html.ini |    8 +-
 ...s-downgrade-upgrade.tentative.sub.html.ini |   23 +-
 ...ect-same-site.tentative.https.sub.html.ini |    8 +-
 ...direct-http-upgrade.tentative.sub.html.ini |   23 +-
 ...ect-https-downgrade.tentative.sub.html.ini |    3 -
 ...igin-redirect.tentative.https.sub.html.ini |   24 +-
 ...site-redirect.tentative.https.sub.html.ini |   24 +-
 .../script.tentative.https.sub.html.ini       |   32 +-
 .../appcache.tentative.https.sub.html.ini     |    4 -
 .../embed.tentative.https.sub.html.ini        |   11 -
 ...tch-preflight.tentative.https.sub.html.ini |    7 -
 ...ker--fallback.tentative.https.sub.html.ini |    4 -
 ...--respondWith.tentative.https.sub.html.ini |    4 -
 .../fetch.tentative.https.sub.html.ini        |   19 -
 .../fetch.tentative.sub.html.ini              |    4 -
 .../font.tentative.https.sub.html.ini         |    5 -
 .../frame.tentative.sub.html.ini              |   14 -
 .../history.tentative.https.sub.html.ini      |   10 -
 .../iframe.tentative.sub.html.ini             |    4 -
 .../img.tentative.https.sub.html.ini          |   10 -
 .../navigation.https.sub.html.ini             |    2 -
 .../object.tentative.https.sub.html.ini       |   11 -
 .../prefetch.tentative.https.sub.html.ini     |   14 -
 .../preload.tentative.https.sub.html.ini      |   59 -
 ...site-redirect.tentative.https.sub.html.ini |   10 -
 ...ct-cross-site.tentative.https.sub.html.ini |    4 -
 ...s-downgrade-upgrade.tentative.sub.html.ini |    5 -
 ...ect-same-site.tentative.https.sub.html.ini |    4 -
 ...direct-http-upgrade.tentative.sub.html.ini |    5 -
 ...ect-https-downgrade.tentative.sub.html.ini |    5 -
 ...igin-redirect.tentative.https.sub.html.ini |   10 -
 ...site-redirect.tentative.https.sub.html.ini |   10 -
 .../report.tentative.https.sub.html.ini       |    2 -
 .../script.tentative.https.sub.html.ini       |   13 -
 ...serviceworker.tentative.https.sub.html.ini |    4 -
 .../sharedworker.tentative.https.sub.html.ini |    5 -
 .../style.tentative.https.sub.html.ini        |   13 -
 .../track.tentative.https.sub.html.ini        |   14 -
 .../trailing-dot.tentative.https.sub.html.ini |   10 -
 .../worker.tentative.https.sub.html.ini       |    4 -
 .../xslt.tentative.https.sub.html.ini         |   10 -
 .../style.tentative.https.sub.html.ini        |   32 +-
 .../worker.tentative.https.sub.html.ini       |    8 +-
 .../nosniff/parsing-nosniff.window.js.ini     |    2 +-
 ...mbedded-credentials.tentative.sub.html.ini |    5 +-
 .../traverse_the_history_1.html.ini           |    4 +
 .../traverse_the_history_5.html.ini           |    4 +
 ...cation-protocol-setter-non-broken.html.ini |    3 -
 ...creating_browsing_context_test_01.html.ini |    3 +-
 ...features-negative-screenx-screeny.html.ini |   19 +
 ...en-features-negative-width-height.html.ini |   19 +
 .../open-features-non-integer-height.html.ini |   34 +-
 ...-features-non-integer-innerheight.html.ini |   28 +-
 ...n-features-non-integer-innerwidth.html.ini |   28 +-
 .../open-features-non-integer-left.html.ini   |   28 +-
 ...open-features-non-integer-screenx.html.ini |   28 +-
 ...open-features-non-integer-screeny.html.ini |   28 +-
 .../embedded-opener-remove-frame.html.ini     |    1 +
 .../html/dom/idlharness.https.html.ini        |    3 +
 .../dom/usvstring-reflection.https.html.ini   |    6 +
 .../iframe_sandbox_popups_escaping-1.html.ini |    3 +-
 .../iframe_sandbox_popups_escaping-3.html.ini |    3 +-
 ...rame_sandbox_popups_nonescaping-3.html.ini |    3 +-
 .../htmlanchorelement_noopener.html.ini       |    3 +
 .../crossorigin-sandwich-TAO.sub.html.ini     |    9 +
 ...rce_timing_buffer_full_eventually.html.ini |    2 -
 .../destination.html.ini                      |    4 +
 .../webmessaging/with-ports/017.html.ini      |    5 -
 .../webmessaging/with-ports/018.html.ini      |    5 -
 .../webmessaging/without-ports/017.html.ini   |    5 -
 .../Worker/Worker-constructor.html.ini        |    2 -
 .../semantics/multiple-workers/005.html.ini   |    1 +
 .../mozilla/task_queue_throttling.any.js.ini  |    6 -
 .../web-platform-tests/.azure-pipelines.yml   |    4 +-
 .../workflows/detect_pull_request_preview.yml |   24 +
 .../.github/workflows/epochs.yml              |    2 +
 .../BackgroundSync/idlharness.https.any.js    |    8 +-
 .../BackgroundSync/service_workers/sw.js      |    4 -
 .../IndexedDB/key_invalid.htm                 |    2 +
 .../idlharness.https.any.js                   |   38 +
 .../periodicsync.https.window.js              |    3 +-
 .../service_workers/sw.js                     |   16 +
 .../WebIDL/current-realm.html                 |   27 +-
 .../sequence-conversion.html                  |   21 +
 ...document_cookie.tentative.https.window.js} |    3 +
 ..._cookie_headers.tentative.https.window.js} |    3 +
 ...me_and_no_value.tentative.https.window.js} |    3 +
 ...equals_in_value.tentative.https.window.js} |    3 +
 ...multiple_values.tentative.https.window.js} |    3 +
 ...istItem_attributes.tentative.https.any.js} |    3 +
 ...e_delete_arguments.tentative.https.any.js} |    3 +
 ...Store_delete_basic.tentative.https.any.js} |    3 +
 ...re_delete_insecure.tentative.https.any.js} |    3 +
 ...event_arguments.tentative.https.window.js} |    0
 ...e_getAll_arguments.tentative.https.any.js} |    3 +
 ...re_getAll_multiple.tentative.https.any.js} |    3 +
 ...e_getAll_set_basic.tentative.https.any.js} |    3 +
 ...tore_get_arguments.tentative.https.any.js} |    3 +
 ...e_get_delete_basic.tentative.https.any.js} |    3 +
 ...tore_get_set_basic.tentative.https.any.js} |    3 +
 ...e_get_set_ordering.tentative.https.any.js} |    7 +-
 ...tore_set_arguments.tentative.https.any.js} |    3 +
 ...tore_special_names.tentative.https.any.js} |    3 +
 .../document_cookie.tentative.https.html      |    8 -
 ....https.window.js => encoding.https.any.js} |    2 +
 ...nd_set_cookie_headers.tentative.https.html |    8 -
 .../no_name_and_no_value.tentative.https.html |    8 -
 ..._name_equals_in_value.tentative.https.html |    8 -
 ..._name_multiple_values.tentative.https.html |    8 -
 .../ordering.tentative.https.html             |    8 -
 .../serviceworker_cookieStore_arguments.js    |   16 -
 ...cookieStore_arguments.tentative.https.html |   22 -
 .../serviceworker_cookieStore_basic.js        |   13 -
 ...ker_cookieStore_basic.tentative.https.html |   22 -
 .../animations/line-height-interpolation.html |  185 ++
 .../background-image-interpolation.html       |  181 +
 .../css-backgrounds/resources/blue-100.png    |  Bin 0 -> 92 bytes
 .../css-backgrounds/resources/green-100.png   |  Bin 0 -> 92 bytes
 .../css-backgrounds/resources/stripes-100.png |  Bin 0 -> 138 bytes
 .../css/css-break/avoid-border-break.html     |    9 +
 .../standard-font-family-10-notref.html       |   17 +
 .../css-fonts/standard-font-family-10.html    |   20 +
 .../standard-font-family-11-notref.html       |   11 +
 .../css-fonts/standard-font-family-11.html    |   14 +
 .../standard-font-family-12-notref.html       |   11 +
 .../css-fonts/standard-font-family-12.html    |   14 +
 .../standard-font-family-13-notref.html       |   11 +
 .../css-fonts/standard-font-family-13.html    |   14 +
 .../standard-font-family-14-notref.html       |   11 +
 .../css-fonts/standard-font-family-14.html    |   20 +
 .../standard-font-family-15-notref.html       |   11 +
 .../css-fonts/standard-font-family-15.html    |   20 +
 .../standard-font-family-16-notref.html       |   11 +
 .../css-fonts/standard-font-family-16.html    |   20 +
 .../css-fonts/standard-font-family-2-ref.html |   18 +
 .../css/css-fonts/standard-font-family-2.html |   21 +
 .../standard-font-family-3-notref.html        |   11 +
 .../css/css-fonts/standard-font-family-3.html |   14 +
 .../standard-font-family-4-notref.html        |   11 +
 .../css/css-fonts/standard-font-family-4.html |   14 +
 .../standard-font-family-5-notref.html        |   11 +
 .../css/css-fonts/standard-font-family-5.html |   14 +
 .../css-fonts/standard-font-family-6-ref.html |   15 +
 .../css/css-fonts/standard-font-family-6.html |   36 +
 .../css-fonts/standard-font-family-7-ref.html |   48 +
 .../css/css-fonts/standard-font-family-7.html |   51 +
 .../standard-font-family-8-notref.html        |   17 +
 .../css/css-fonts/standard-font-family-8.html |   20 +
 .../standard-font-family-9-notref.html        |   17 +
 .../css/css-fonts/standard-font-family-9.html |   20 +
 .../css-fonts/standard-font-family-ref.html   |   15 +
 .../css/css-fonts/standard-font-family.html   |   18 +
 ...g-grid-container-containing-block-001.html |    2 +-
 ...positioning-grid-container-parent-001.html |    2 +-
 .../grid-paint-positioned-children-001.html   |    2 +-
 ...tioned-children-writing-modes-001-ref.html |    2 +-
 ...positioned-children-writing-modes-001.html |    2 +-
 ...sitioned-items-and-autofit-tracks-001.html |    2 +-
 ...sitioned-items-and-autofit-tracks-002.html |    2 +-
 ...sitioned-items-and-autofit-tracks-003.html |    2 +-
 ...sitioned-items-and-autofit-tracks-004.html |    2 +-
 ...sitioned-items-and-autofit-tracks-005.html |    2 +-
 ...sitioned-items-and-autofit-tracks-006.html |    2 +-
 ...sitioned-items-and-autofit-tracks-007.html |    2 +-
 .../grid-positioned-items-background-001.html |    2 +-
 ...d-positioned-items-background-rtl-001.html |    2 +-
 ...ositioned-items-content-alignment-001.html |    2 +-
 ...ioned-items-content-alignment-rtl-001.html |    2 +-
 .../grid-positioned-items-gaps-001.html       |    2 +-
 .../grid-positioned-items-gaps-002-rtl.html   |    2 +-
 .../grid-positioned-items-gaps-002.html       |    2 +-
 .../grid-positioned-items-gaps-rtl-001.html   |    2 +-
 ...id-positioned-items-implicit-grid-001.html |    2 +-
 ...sitioned-items-implicit-grid-line-001.html |    2 +-
 .../grid-positioned-items-padding-001.html    |    2 +-
 ...ned-items-unknown-named-grid-line-001.html |    2 +-
 ...-items-within-grid-implicit-track-001.html |    2 +-
 .../grid-sizing-positioned-items-001.html     |    2 +-
 ...should-not-create-implicit-tracks-001.html |    2 +-
 ...id-items-should-not-take-up-space-001.html |    2 +-
 .../positioned-grid-items-sizing-001-ref.html |    2 +-
 .../positioned-grid-items-sizing-001.html     |    2 +-
 .../css/css-grid/abspos/support/grid.css      |  283 --
 .../grid-baseline-align-cycles-001.html       |  126 +
 ...mn-axis-self-baseline-synthesized-001.html |    2 +-
 ...mn-axis-self-baseline-synthesized-002.html |    2 +-
 ...mn-axis-self-baseline-synthesized-003.html |    2 +-
 ...mn-axis-self-baseline-synthesized-004.html |    2 +-
 ...rid-content-alignment-second-pass-001.html |    2 +-
 ...rid-content-alignment-second-pass-002.html |    2 +-
 ...ow-axis-self-baseline-synthesized-001.html |    2 +-
 ...ow-axis-self-baseline-synthesized-002.html |    2 +-
 ...ow-axis-self-baseline-synthesized-003.html |    2 +-
 ...ow-axis-self-baseline-synthesized-004.html |    2 +-
 ...plied-if-sizing-cyclic-dependency-001.html |    2 +-
 ...plied-if-sizing-cyclic-dependency-002.html |    2 +-
 ...plied-if-sizing-cyclic-dependency-003.html |    2 +-
 .../grid-baseline-align-cycles-001-ref.html   |  115 +
 .../grid-auto-repeat-max-size-001.html        |    2 +-
 .../grid-auto-repeat-max-size-002.html        |    2 +-
 .../grid-auto-repeat-min-max-size-001.html    |    2 +-
 .../grid-auto-repeat-min-size-001.html        |    2 +-
 .../grid-auto-repeat-min-size-002.html        |    2 +-
 .../grid-change-auto-repeat-tracks.html       |    2 +-
 .../grid-change-fit-content-argument-001.html |    2 +-
 .../grid-inline-auto-repeat-001.html          |    2 +-
 ...percentage-rows-indefinite-height-001.html |    2 +-
 ...-template-columns-fit-content-001-ref.html |    2 +-
 ...grid-template-columns-fit-content-001.html |    2 +-
 ...rid-template-rows-fit-content-001-ref.html |    2 +-
 .../grid-template-rows-fit-content-001.html   |    2 +-
 .../css-grid/grid-definition/support/grid.css |  283 --
 .../grid-items-minimum-width-001.html         |    2 +-
 .../grid-items-minimum-width-002.html         |    2 +-
 ...id-items-minimum-width-orthogonal-001.html |    2 +-
 ...id-items-minimum-width-orthogonal-002.html |    2 +-
 ...d-items-minimum-width-vertical-lr-001.html |    2 +-
 ...d-items-minimum-width-vertical-lr-002.html |    2 +-
 ...d-items-minimum-width-vertical-rl-001.html |    2 +-
 ...d-items-minimum-width-vertical-rl-002.html |    2 +-
 .../grid-items-percentage-margins-001.html    |    2 +-
 .../grid-items-percentage-margins-002.html    |    2 +-
 .../grid-items-percentage-margins-003.html    |    2 +-
 .../grid-items-percentage-margins-004.html    |    2 +-
 .../grid-items-percentage-margins-005.html    |    2 +-
 .../grid-items-percentage-margins-006.html    |    2 +-
 .../grid-items-percentage-margins-007.html    |    2 +-
 .../grid-items-percentage-margins-008.html    |    2 +-
 .../grid-items-percentage-margins-009.html    |    2 +-
 .../grid-items-percentage-margins-010.html    |    2 +-
 .../grid-items-percentage-margins-011.html    |    2 +-
 .../grid-items-percentage-margins-012.html    |    2 +-
 .../grid-items-percentage-margins-013.html    |    2 +-
 .../grid-items-percentage-margins-014.html    |    2 +-
 ...ms-percentage-margins-vertical-lr-001.html |    2 +-
 ...ms-percentage-margins-vertical-lr-002.html |    2 +-
 ...ms-percentage-margins-vertical-rl-001.html |    2 +-
 ...ms-percentage-margins-vertical-rl-002.html |    2 +-
 .../grid-items-percentage-paddings-001.html   |    2 +-
 .../grid-items-percentage-paddings-002.html   |    2 +-
 .../grid-items-percentage-paddings-003.html   |    2 +-
 .../grid-items-percentage-paddings-004.html   |    2 +-
 .../grid-items-percentage-paddings-005.html   |    2 +-
 .../grid-items-percentage-paddings-006.html   |    2 +-
 .../grid-items-percentage-paddings-007.html   |    2 +-
 .../grid-items-percentage-paddings-008.html   |    2 +-
 .../grid-items-percentage-paddings-009.html   |    2 +-
 .../grid-items-percentage-paddings-010.html   |    2 +-
 .../grid-items-percentage-paddings-011.html   |    2 +-
 .../grid-items-percentage-paddings-012.html   |    2 +-
 .../grid-items-percentage-paddings-013.html   |    2 +-
 .../grid-items-percentage-paddings-014.html   |    2 +-
 ...s-percentage-paddings-vertical-lr-001.html |    2 +-
 ...s-percentage-paddings-vertical-lr-002.html |    2 +-
 ...s-percentage-paddings-vertical-rl-001.html |    2 +-
 ...s-percentage-paddings-vertical-rl-002.html |    2 +-
 .../grid-items-relative-offsets-001.html      |    3 +-
 .../grid-items-relative-offsets-002.html      |    2 +-
 .../grid-minimum-size-grid-items-022.html     |    2 +-
 .../grid-minimum-size-grid-items-023.html     |    2 +-
 .../grid-minimum-size-grid-items-024.html     |    2 +-
 .../grid-minimum-size-grid-items-025.html     |    2 +-
 .../css/css-grid/grid-items/support/grid.css  |  283 --
 ...-areas-overflowing-grid-container-001.html |    2 +-
 ...-areas-overflowing-grid-container-002.html |    2 +-
 ...-areas-overflowing-grid-container-003.html |    2 +-
 ...-areas-overflowing-grid-container-004.html |    2 +-
 ...-areas-overflowing-grid-container-005.html |    2 +-
 ...-areas-overflowing-grid-container-006.html |    2 +-
 ...-areas-overflowing-grid-container-007.html |    2 +-
 ...-areas-overflowing-grid-container-008.html |    2 +-
 ...id-container-ignores-first-letter-001.html |    2 +-
 ...grid-container-ignores-first-line-001.html |    2 +-
 .../grid-container-scrollbar-001.html         |    2 +-
 ...d-container-scrollbar-vertical-lr-001.html |    2 +-
 ...d-container-scrollbar-vertical-rl-001.html |    2 +-
 .../grid-item-accepts-first-letter-001.html   |    2 +-
 .../grid-item-accepts-first-line-001.html     |    2 +-
 .../css/css-grid/grid-model/support/grid.css  |  283 --
 .../css/css-logical/animation-001.html        |   12 +
 .../css/css-logical/animation-002.html        |   13 +
 .../clip-path-recursion-002.svg               |    7 +-
 .../reference/clip-path-recursion-002-ref.svg |    5 +
 .../clip-path-svg-invalidate-ref.html         |   28 +
 .../clip-path/clip-path-svg-invalidate.html   |   41 +
 .../hidpi/canvas-transform-ref.html           |    9 +-
 .../css/css-scroll-snap/input/keyboard.html   |  128 +
 ...rea-capturing-remove-scroll-container.html |   56 +-
 ...p-area-caputring-add-scroll-container.html |  149 +
 .../css/css-scroll-snap/support/common.css    |   44 +
 .../css/css-scroll-snap/support/common.js     |   64 +
 .../css-sizing/ortho-writing-mode-001.html    |   16 +
 .../percentage-resolution-001-ref.html        |   16 +
 .../css-sizing/percentage-resolution-001.html |   26 +
 .../animation/rotate-interpolation.html       |   58 +-
 .../animation/scale-interpolation.html        |   12 +-
 .../animation/translate-interpolation.html    |   12 +-
 .../vertical-align-interpolation.html         |   98 +
 .../animations/z-index-interpolation.html     |  130 +
 .../minmax-length-percent-serialize.html      |   60 +-
 ...IntoView-horizontal-partially-visible.html |   47 +
 .../web-platform-tests/css/support/grid.css   |   48 +-
 .../css/support/interpolation-testcommon.js   |    7 +-
 .../docs/writing-tests/testharness-api.md     |   34 +-
 .../appcache.tentative.https.sub.html         |    3 +-
 .../metadata/embed.tentative.https.sub.html   |    4 +-
 .../fetch-preflight.tentative.https.sub.html  |   22 +-
 ...eworker--fallback.tentative.https.sub.html |    2 +-
 ...rker--respondWith.tentative.https.sub.html |    2 +-
 .../metadata/fetch.tentative.https.sub.html   |   54 +-
 .../fetch/metadata/fetch.tentative.sub.html   |   18 +-
 .../metadata/font.tentative.https.sub.html    |   18 +-
 .../metadata/history.tentative.https.sub.html |   20 +-
 .../metadata/iframe.tentative.https.sub.html  |   20 +-
 .../fetch/metadata/iframe.tentative.sub.html  |   12 +-
 .../metadata/img.tentative.https.sub.html     |   18 +-
 .../fetch/metadata/navigation.https.sub.html  |    2 +
 .../metadata/object.tentative.https.sub.html  |   18 +-
 .../metadata/portal.tentative.https.sub.html  |   11 +-
 .../prefetch.tentative.https.sub.html         |    8 +-
 .../metadata/preload.tentative.https.sub.html |    6 +-
 ...oss-site-redirect.tentative.https.sub.html |   30 +-
 ...direct-cross-site.tentative.https.sub.html |   10 +-
 ...https-downgrade-upgrade.tentative.sub.html |   60 +-
 ...edirect-same-site.tentative.https.sub.html |   10 +-
 .../redirect-http-upgrade.tentative.sub.html  |   14 +-
 ...edirect-https-downgrade.tentative.sub.html |   12 +-
 ...e-origin-redirect.tentative.https.sub.html |   30 +-
 ...ame-site-redirect.tentative.https.sub.html |   30 +-
 .../metadata/report.tentative.https.sub.html  |   10 +-
 .../fetch/metadata/resources/helper.js        |   73 +-
 .../resources/redirectTestHelper.sub.js       |   26 +-
 .../metadata/resources/xslt-test.sub.xml      |    3 +-
 .../metadata/script.tentative.https.sub.html  |   12 +-
 .../fetch/metadata/script.tentative.sub.html  |    9 +-
 .../appcache.tentative.https.sub.html         |   18 -
 .../embed.tentative.https.sub.html            |   53 -
 .../fetch-preflight.tentative.https.sub.html  |   26 -
 ...eworker--fallback.tentative.https.sub.html |   49 -
 ...rker--respondWith.tentative.https.sub.html |   50 -
 .../fetch.tentative.https.sub.html            |   43 -
 .../sec-fetch-dest/fetch.tentative.sub.html   |   23 -
 .../font.tentative.https.sub.html             |   69 -
 .../frame.tentative.https.sub.html            |   55 -
 .../sec-fetch-dest/frame.tentative.sub.html   |   62 -
 .../history.tentative.https.sub.html          |   72 -
 .../iframe.tentative.https.sub.html           |   55 -
 .../sec-fetch-dest/iframe.tentative.sub.html  |   62 -
 .../img.tentative.https.sub.html              |   45 -
 .../sec-fetch-dest/navigation.https.sub.html  |   14 -
 .../object.tentative.https.sub.html           |   53 -
 .../portal.tentative.https.sub.html           |   33 -
 .../prefetch.tentative.https.sub.html         |   36 -
 .../preload.tentative.https.sub.html          |   51 -
 ...oss-site-redirect.tentative.https.sub.html |   62 -
 ...direct-cross-site.tentative.https.sub.html |   31 -
 ...https-downgrade-upgrade.tentative.sub.html |   56 -
 ...edirect-same-site.tentative.https.sub.html |   31 -
 .../redirect-http-upgrade.tentative.sub.html  |   56 -
 ...edirect-https-downgrade.tentative.sub.html |   55 -
 ...e-origin-redirect.tentative.https.sub.html |   65 -
 ...ame-site-redirect.tentative.https.sub.html |   65 -
 .../report.tentative.https.sub.html           |   30 -
 ...eport.tentative.https.sub.html.sub.headers |    3 -
 .../script.tentative.https.sub.html           |   44 -
 .../sec-fetch-dest/script.tentative.sub.html  |   34 -
 .../serviceworker.tentative.https.sub.html    |   35 -
 .../sharedworker.tentative.https.sub.html     |   36 -
 .../style.tentative.https.sub.html            |   74 -
 .../track.tentative.https.sub.html            |   88 -
 .../trailing-dot.tentative.https.sub.html     |   30 -
 .../unload.tentative.https.sub.html           |   58 -
 .../window-open.tentative.https.sub.html      |  154 -
 .../worker.tentative.https.sub.html           |   21 -
 .../xslt.tentative.https.sub.html             |   31 -
 .../serviceworker.tentative.https.sub.html    |    2 +-
 .../sharedworker.tentative.https.sub.html     |    6 +-
 .../metadata/style.tentative.https.sub.html   |   24 +-
 .../metadata/track.tentative.https.sub.html   |   28 +-
 .../trailing-dot.tentative.https.sub.html     |   27 +-
 .../metadata/unload.tentative.https.sub.html  |    3 +-
 .../window-open.tentative.https.sub.html      |   27 +-
 .../metadata/worker.tentative.https.sub.html  |    6 +-
 .../metadata/xslt.tentative.https.sub.html    |   21 +-
 .../html/dom/usvstring-reflection.https.html  |    4 +-
 .../link-multiple-error-events.html           |   21 +
 .../link-multiple-load-events.html            |   21 +
 .../the-navigator-object/protocol.https.html  |   16 +-
 .../the-navigator-object/secure_context.html  |   18 +
 .../core/not-as-classic-script.html           |   45 +
 .../inert/inert-in-shadow-dom.tentative.html  |   48 +-
 .../inert/inert-on-slots.tentative.html       |   57 +
 .../actions/multiTouchPoints.html.ini         |    3 +
 .../multiTouchPointsWithPause.html.ini        |    3 +
 .../actions/multiTouchPointsWithPause.html    |   55 +
 .../interfaces/DOM-Parsing.idl                |   10 +-
 .../interfaces/audio-output.idl               |    2 +-
 .../interfaces/battery-status.idl             |   12 +-
 .../web-platform-tests/interfaces/hr-time.idl |    2 +-
 .../web-platform-tests/interfaces/html.idl    |    9 +-
 .../interfaces/media-playback-quality.idl     |    1 -
 .../interfaces/mediacapture-depth.idl         |    2 +-
 .../interfaces/mediacapture-fromelement.idl   |    6 +-
 .../interfaces/navigation-timing.idl          |    4 +-
 .../interfaces/payment-handler.idl            |   18 +-
 .../interfaces/performance-timeline.idl       |   14 +-
 .../interfaces/pointerevents-extension.idl    |   14 -
 .../interfaces/pointerevents.idl              |   10 +-
 .../interfaces/pointerlock.idl                |    2 +-
 .../interfaces/remote-playback.idl            |    2 +-
 .../interfaces/requestidlecallback.idl        |    2 -
 .../interfaces/resize-observer.idl            |    8 +-
 .../interfaces/resource-timing.idl            |   14 +-
 .../interfaces/vibration.idl                  |    2 +-
 .../interfaces/wake-lock.idl                  |    4 +-
 .../web-platform-tests/interfaces/web-nfc.idl |    2 +-
 .../interfaces/webaudio.idl                   |    2 +-
 .../web-platform-tests/interfaces/webmidi.idl |   18 +-
 .../interfaces/webrtc-identity.idl            |   14 +-
 .../interfaces/webrtc-stats.idl               |  491 +--
 .../web-platform-tests/interfaces/webrtc.idl  |   18 -
 .../v2/position-relative.html                 |   49 +
 tests/wpt/web-platform-tests/lint.whitelist   |    6 +
 .../media-capabilities/decodingInfo.any.js    |   33 +-
 .../decodingInfoEncryptedMedia.https.html     |   61 +-
 .../media-capabilities/encodingInfo.html      |   32 +-
 ...ointerevent_touch-action-verification.html |   45 +
 .../extension/idlharness.window.js            |   14 -
 .../extension/pointerevent_constructor.html   |  108 -
 ...ointerevent_touch-action-verification.html |   97 -
 ...nterevent_coalesced_events_attributes.html |    6 +-
 .../pointerevent_constructor.html             |  144 +-
 .../pointerevent_pointerrawupdate.html        |    4 +-
 ...nt_predicted_events_attributes-manual.html |    4 +-
 ...event_touch-action-pan-down-css_touch.html |    4 +-
 ...event_touch-action-pan-left-css_touch.html |    4 +-
 ...vent_touch-action-pan-right-css_touch.html |    4 +-
 ...erevent_touch-action-pan-up-css_touch.html |    4 +-
 ...ointerevent_touch-action-verification.html |   12 +
 ...getCoalescedEvents_when_pointerlocked.html |    2 +-
 ...ictedEvents_when_pointerlocked-manual.html |    4 +-
 ...ointerrawupdate_in_pointerlock-manual.html |    4 +-
 .../crossorigin-sandwich-TAO.sub.html         |   47 +-
 .../crossorigin-sandwich-no-TAO.sub.html      |    5 +-
 .../crossorigin-sandwich-partial-TAO.sub.html |    6 +-
 ...ource_TAO_cross_origin_redirect_chain.html |    1 -
 .../resources/blue-with-tao.png               |  Bin 0 -> 1010 bytes
 .../resources/blue-with-tao.png.headers       |    1 +
 .../resources/multi_redirect.py               |   19 +-
 .../resources/webperftestharness.js           |   16 +-
 .../resources/chromium/nfc-mock.js            |   19 +-
 .../resources/chromium/webxr-test.js          |    2 -
 .../resources/sriharness.js                   |    2 -
 .../tests/unit/promise_setup-timeout.html     |   28 +
 .../test/tests/unit/promise_setup.html        |  333 ++
 .../resources/testharness.js                  |   65 +-
 .../screen-capture/feature-policy.https.html  |   28 +-
 .../screen-capture/getdisplaymedia.https.html |   46 +-
 .../cache-storage/resources/vary.py           |    4 +-
 ...referrer-toplevel-script-fetch.https.html} |   21 +-
 .../resources/test-request-headers-worker.js  |    3 +
 .../resources/test-request-headers-worker.py  |    2 +
 .../focus/focus-method-delegatesFocus.html    |   47 +
 .../shadow-dom/innerHTML-setter.xhtml         |   81 +
 .../reftests/reference/green-100x100.html     |    2 +
 .../support/etag-max-age-zero-icons.svg       |    5 +
 .../etag-max-age-zero-icons.svg.headers       |    2 +
 ...-resource-with-revalidation.tentative.html |   36 +
 .../web-platform-tests/tools/ci/pr_preview.py |  408 +++
 .../tools/ci/tests/test_pr_preview.py         |  720 ++++
 .../tools/requirements_flake8.txt             |    2 +-
 tests/wpt/web-platform-tests/tools/tox.ini    |    2 +
 .../tools/webdriver/webdriver/__init__.py     |    4 +-
 .../tools/webdriver/webdriver/client.py       |    9 +-
 .../tools/webdriver/webdriver/error.py        |    3 +-
 .../tools/webdriver/webdriver/transport.py    |    6 +-
 .../web-platform-tests/tools/wpt/browser.py   |    1 -
 tests/wpt/web-platform-tests/tools/wpt/run.py |    4 +-
 .../tools/wptrunner/requirements.txt          |    2 +-
 .../wptrunner/executors/executormarionette.py |    2 +-
 .../wptrunner/formatters/chromium.py          |   29 +-
 .../formatters/tests/test_chromium.py         |   72 +-
 .../TrustedType-AttributeNodes.tentative.html |   93 +
 ...ory-createPolicy-unenforced.tentative.html |   16 +
 ...ed-types-createHTMLDocument.tentative.html |   82 +-
 ...o-resize-event-on-overflow-recalc.html.ini |    6 -
 .../applying-interpolated-transform.html      |   87 +
 ...EFReader-document-hidden-manual.https.html |   17 +-
 .../web-nfc/NDEFReader_options.https.html     |    6 +-
 .../web-nfc/NDEFReader_scan.https.html        |  185 +-
 .../web-nfc/NDEFReader_scan_iframe.https.html |    4 +-
 .../web-nfc/NDEFRecord_constructor.https.html |   54 +-
 .../web-nfc/NDEFWriter_push.https.html        |   36 +-
 .../web-nfc/resources/nfc-helpers.js          |   28 +-
 .../processing-model/cycle-without-delay.html |   36 +
 .../processing-model/cycle-witout-delay.html  |   35 -
 .../processing-model/delay-time-clamping.html |   57 +-
 .../processing-model/feedback-delay-time.html |   54 +-
 .../destination.html                          |   51 +
 .../tests/perform_actions/support/keys.py     |    4 +-
 .../suites/cts/command_buffer/basic.spec.js   |    2 +-
 .../cts/command_buffer/compute/basic.spec.js  |    2 +-
 .../suites/cts/command_buffer/copies.spec.js  |    6 +-
 .../cts/command_buffer/render/basic.spec.js   |    2 +-
 .../command_buffer/render/rendering.spec.js   |    2 +-
 .../cts/command_buffer/render/storeop.spec.js |    2 +-
 .../webgpu/suites/cts/gpu_test.js             |    2 +-
 .../suites/cts/validation/error_scope.spec.js |    2 +-
 .../suites/cts/validation/fences.spec.js      |    4 +-
 .../webrtc/RTCSctpTransport-events.html       |    3 +-
 558 files changed, 8615 insertions(+), 6607 deletions(-)
 create mode 100644 tests/wpt/metadata/css/CSS2/floats/floats-in-table-caption-001.html.ini
 create mode 100644 tests/wpt/metadata/css/CSS2/linebox/animations/line-height-interpolation.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/text/white-space-002.xht.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/text/white-space-003.xht.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/visudet/line-height-204.html.ini
 delete mode 100644 tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini
 create mode 100644 tests/wpt/metadata/css/css-backgrounds/animations/background-image-interpolation.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
 create mode 100644 tests/wpt/metadata/css/css-fonts/standard-font-family-11.html.ini
 create mode 100644 tests/wpt/metadata/css/css-fonts/standard-font-family-12.html.ini
 create mode 100644 tests/wpt/metadata/css/css-fonts/standard-font-family-13.html.ini
 create mode 100644 tests/wpt/metadata/css/css-fonts/standard-font-family-14.html.ini
 create mode 100644 tests/wpt/metadata/css/css-fonts/standard-font-family-15.html.ini
 create mode 100644 tests/wpt/metadata/css/css-fonts/standard-font-family-16.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/hyphens/hyphens-out-of-flow-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/line-break/line-break-normal-018.xht.ini
 create mode 100644 tests/wpt/metadata/css/css-text/line-break/line-break-strict-018.xht.ini
 create mode 100644 tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-002.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-004.html.ini
 create mode 100644 tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-004.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/word-break/word-break-break-all-007.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-text/word-break/word-break-keep-all-006.html.ini
 delete mode 100644 tests/wpt/metadata/css/css-transforms/css-transforms-3d-on-anonymous-block-001.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transitions/animations/vertical-align-interpolation.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transitions/animations/z-index-interpolation.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/scrollIntoView-horizontal-partially-visible.html.ini
 create mode 100644 tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini
 create mode 100644 tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini
 create mode 100644 tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/navigation.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html.ini
 delete mode 100644 tests/wpt/metadata/fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
 delete mode 100644 tests/wpt/metadata/resource-timing/resource_timing_buffer_full_eventually.html.ini
 create mode 100644 tests/wpt/metadata/webaudio/the-audio-api/the-destinationnode-interface/destination.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/with-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/with-ports/018.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/without-ports/017.html.ini
 delete mode 100644 tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
 delete mode 100644 tests/wpt/mozilla/meta/mozilla/task_queue_throttling.any.js.ini
 create mode 100644 tests/wpt/web-platform-tests/.github/workflows/detect_pull_request_preview.yml
 create mode 100644 tests/wpt/web-platform-tests/PeriodicBackgroundSync/idlharness.https.any.js
 rename tests/wpt/web-platform-tests/{BackgroundSync => PeriodicBackgroundSync}/periodicsync.https.window.js (92%)
 create mode 100644 tests/wpt/web-platform-tests/PeriodicBackgroundSync/service_workers/sw.js
 rename tests/wpt/web-platform-tests/cookie-store/{resources/document_cookie.js => change_eventhandler_for_document_cookie.tentative.https.window.js} (97%)
 rename tests/wpt/web-platform-tests/cookie-store/{resources/http_cookie_and_set_cookie_headers.js => change_eventhandler_for_http_cookie_and_set_cookie_headers.tentative.https.window.js} (97%)
 rename tests/wpt/web-platform-tests/cookie-store/{resources/no_name_and_no_value.js => change_eventhandler_for_no_name_and_no_value.tentative.https.window.js} (88%)
 rename tests/wpt/web-platform-tests/cookie-store/{resources/no_name_equals_in_value.js => change_eventhandler_for_no_name_equals_in_value.tentative.https.window.js} (89%)
 rename tests/wpt/web-platform-tests/cookie-store/{resources/no_name_multiple_values.js => change_eventhandler_for_no_name_multiple_values.tentative.https.window.js} (87%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieListItem_attributes.tentative.https.window.js => cookieListItem_attributes.tentative.https.any.js} (98%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_delete_arguments.tentative.https.window.js => cookieStore_delete_arguments.tentative.https.any.js} (98%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_delete_basic.tentative.https.window.js => cookieStore_delete_basic.tentative.https.any.js} (76%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_delete_insecure.tentative.https.window.js => cookieStore_delete_insecure.tentative.https.any.js} (86%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_event_arguments.tenative.https.window.js => cookieStore_event_arguments.tentative.https.window.js} (100%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_getAll_arguments.tentative.https.window.js => cookieStore_getAll_arguments.tentative.https.any.js} (97%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_getAll_multiple.tentative.https.window.js => cookieStore_getAll_multiple.tentative.https.any.js} (89%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_getAll_set_basic.tentative.https.window.js => cookieStore_getAll_set_basic.tentative.https.any.js} (76%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_get_arguments.tentative.https.window.js => cookieStore_get_arguments.tentative.https.any.js} (97%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_get_delete_basic.tentative.https.window.js => cookieStore_get_delete_basic.tentative.https.any.js} (70%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_get_set_basic.tentative.https.window.js => cookieStore_get_set_basic.tentative.https.any.js} (74%)
 rename tests/wpt/web-platform-tests/cookie-store/{resources/ordering.js => cookieStore_get_set_ordering.tentative.https.any.js} (92%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_set_arguments.tentative.https.window.js => cookieStore_set_arguments.tentative.https.any.js} (98%)
 rename tests/wpt/web-platform-tests/cookie-store/{cookieStore_special_names.tentative.https.window.js => cookieStore_special_names.tentative.https.any.js} (90%)
 delete mode 100644 tests/wpt/web-platform-tests/cookie-store/document_cookie.tentative.https.html
 rename tests/wpt/web-platform-tests/cookie-store/{encoding.https.window.js => encoding.https.any.js} (85%)
 delete mode 100644 tests/wpt/web-platform-tests/cookie-store/http_cookie_and_set_cookie_headers.tentative.https.html
 delete mode 100644 tests/wpt/web-platform-tests/cookie-store/no_name_and_no_value.tentative.https.html
 delete mode 100644 tests/wpt/web-platform-tests/cookie-store/no_name_equals_in_value.tentative.https.html
 delete mode 100644 tests/wpt/web-platform-tests/cookie-store/no_name_multiple_values.tentative.https.html
 delete mode 100644 tests/wpt/web-platform-tests/cookie-store/ordering.tentative.https.html
 delete mode 100644 tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_arguments.js
 delete mode 100644 tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_arguments.tentative.https.html
 delete mode 100644 tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_basic.js
 delete mode 100644 tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_basic.tentative.https.html
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/linebox/animations/line-height-interpolation.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-image-interpolation.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/resources/blue-100.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/resources/green-100.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-backgrounds/resources/stripes-100.png
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/avoid-border-break.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-fonts/standard-font-family.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-grid/abspos/support/grid.css
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html
 delete mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-definition/support/grid.css
 delete mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-items/support/grid.css
 delete mode 100644 tests/wpt/web-platform-tests/css/css-grid/grid-model/support/grid.css
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scroll-snap/input/keyboard.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-caputring-add-scroll-container.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.css
 create mode 100644 tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.js
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/ortho-writing-mode-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/percentage-resolution-001-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/percentage-resolution-001.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transitions/animations/vertical-align-interpolation.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transitions/animations/z-index-interpolation.html
 create mode 100644 tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-horizontal-partially-visible.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/navigation.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/portal.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.sub.headers
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/script.tentative.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/unload.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/window-open.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html
 delete mode 100644 tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events.html
 create mode 100644 tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events.html
 create mode 100644 tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html
 create mode 100644 tests/wpt/web-platform-tests/import-maps/core/not-as-classic-script.html
 create mode 100644 tests/wpt/web-platform-tests/inert/inert-on-slots.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsWithPause.html
 delete mode 100644 tests/wpt/web-platform-tests/interfaces/pointerevents-extension.idl
 create mode 100644 tests/wpt/web-platform-tests/intersection-observer/v2/position-relative.html
 create mode 100644 tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_touch-action-verification.html
 delete mode 100644 tests/wpt/web-platform-tests/pointerevents/extension/idlharness.window.js
 delete mode 100644 tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_constructor.html
 delete mode 100644 tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-verification.html
 rename tests/wpt/web-platform-tests/pointerevents/{extension => }/pointerevent_coalesced_events_attributes.html (98%)
 rename tests/wpt/web-platform-tests/pointerevents/{extension => }/pointerevent_pointerrawupdate.html (95%)
 rename tests/wpt/web-platform-tests/pointerevents/{extension => }/pointerevent_predicted_events_attributes-manual.html (97%)
 rename tests/wpt/web-platform-tests/pointerevents/{extension => }/pointerevent_touch-action-pan-down-css_touch.html (97%)
 rename tests/wpt/web-platform-tests/pointerevents/{extension => }/pointerevent_touch-action-pan-left-css_touch.html (97%)
 rename tests/wpt/web-platform-tests/pointerevents/{extension => }/pointerevent_touch-action-pan-right-css_touch.html (97%)
 rename tests/wpt/web-platform-tests/pointerevents/{extension => }/pointerevent_touch-action-pan-up-css_touch.html (97%)
 rename tests/wpt/web-platform-tests/pointerevents/{extension => pointerlock}/pointerevent_getCoalescedEvents_when_pointerlocked.html (99%)
 rename tests/wpt/web-platform-tests/pointerevents/{extension => pointerlock}/pointerevent_getPredictedEvents_when_pointerlocked-manual.html (95%)
 rename tests/wpt/web-platform-tests/pointerevents/{extension => pointerlock}/pointerevent_pointerrawupdate_in_pointerlock-manual.html (96%)
 create mode 100644 tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png
 create mode 100644 tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png.headers
 create mode 100644 tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup-timeout.html
 create mode 100644 tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup.html
 rename tests/wpt/web-platform-tests/service-workers/service-worker/{referer-toplevel-script-fetch.https.html => referrer-toplevel-script-fetch.https.html} (52%)
 create mode 100644 tests/wpt/web-platform-tests/shadow-dom/innerHTML-setter.xhtml
 create mode 100644 tests/wpt/web-platform-tests/svg/struct/reftests/reference/green-100x100.html
 create mode 100644 tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg
 create mode 100644 tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg.headers
 create mode 100644 tests/wpt/web-platform-tests/svg/struct/reftests/use-external-resource-with-revalidation.tentative.html
 create mode 100755 tests/wpt/web-platform-tests/tools/ci/pr_preview.py
 create mode 100644 tests/wpt/web-platform-tests/tools/ci/tests/test_pr_preview.py
 create mode 100644 tests/wpt/web-platform-tests/trusted-types/TrustedType-AttributeNodes.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html
 delete mode 100644 tests/wpt/web-platform-tests/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html.ini
 create mode 100644 tests/wpt/web-platform-tests/web-animations/animation-model/combining-effects/applying-interpolated-transform.html
 create mode 100644 tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/cycle-without-delay.html
 delete mode 100644 tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/cycle-witout-delay.html
 create mode 100644 tests/wpt/web-platform-tests/webaudio/the-audio-api/the-destinationnode-interface/destination.html

diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index 76b398963aee..a9e467132440 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: FAIL
diff --git a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
index abf0d50aff37..0bf3b4693726 100644
--- a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
@@ -7,6 +7,3 @@
   [Revoke blob URL after creating Request, will fetch]
     expected: FAIL
 
-  [Revoke blob URL after calling fetch, fetch should succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 39e2d500e7db..3bf07accd5a2 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -14509,24 +14509,6 @@
      {}
     ]
    ],
-   "pointerevents/extension/pointerevent_getPredictedEvents_when_pointerlocked-manual.html": [
-    [
-     "pointerevents/extension/pointerevent_getPredictedEvents_when_pointerlocked-manual.html",
-     {}
-    ]
-   ],
-   "pointerevents/extension/pointerevent_pointerrawupdate_in_pointerlock-manual.html": [
-    [
-     "pointerevents/extension/pointerevent_pointerrawupdate_in_pointerlock-manual.html",
-     {}
-    ]
-   ],
-   "pointerevents/extension/pointerevent_predicted_events_attributes-manual.html": [
-    [
-     "pointerevents/extension/pointerevent_predicted_events_attributes-manual.html",
-     {}
-    ]
-   ],
    "pointerevents/html/pointerevent_drag_interaction-manual.html": [
     [
      "pointerevents/html/pointerevent_drag_interaction-manual.html",
@@ -14569,6 +14551,12 @@
      {}
     ]
    ],
+   "pointerevents/pointerevent_predicted_events_attributes-manual.html": [
+    [
+     "pointerevents/pointerevent_predicted_events_attributes-manual.html",
+     {}
+    ]
+   ],
    "pointerevents/pointerevent_releasepointercapture_release_right_after_capture-manual.html": [
     [
      "pointerevents/pointerevent_releasepointercapture_release_right_after_capture-manual.html",
@@ -14599,6 +14587,18 @@
      {}
     ]
    ],
+   "pointerevents/pointerlock/pointerevent_getPredictedEvents_when_pointerlocked-manual.html": [
+    [
+     "pointerevents/pointerlock/pointerevent_getPredictedEvents_when_pointerlocked-manual.html",
+     {}
+    ]
+   ],
+   "pointerevents/pointerlock/pointerevent_pointerrawupdate_in_pointerlock-manual.html": [
+    [
+     "pointerevents/pointerlock/pointerevent_pointerrawupdate_in_pointerlock-manual.html",
+     {}
+    ]
+   ],
    "pointerlock/movementX_Y_no-jumps-manual.html": [
     [
      "pointerlock/movementX_Y_no-jumps-manual.html",
@@ -110193,6 +110193,18 @@
      {}
     ]
    ],
+   "css/css-break/avoid-border-break.html": [
+    [
+     "css/css-break/avoid-border-break.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square-only.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-break/block-end-aligned-abspos-nested.html": [
     [
      "css/css-break/block-end-aligned-abspos-nested.html",
@@ -124159,6 +124171,198 @@
      {}
     ]
    ],
+   "css/css-fonts/standard-font-family-10.html": [
+    [
+     "css/css-fonts/standard-font-family-10.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-10-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-11.html": [
+    [
+     "css/css-fonts/standard-font-family-11.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-11-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-12.html": [
+    [
+     "css/css-fonts/standard-font-family-12.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-12-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-13.html": [
+    [
+     "css/css-fonts/standard-font-family-13.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-13-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-14.html": [
+    [
+     "css/css-fonts/standard-font-family-14.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-14-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-15.html": [
+    [
+     "css/css-fonts/standard-font-family-15.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-15-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-16.html": [
+    [
+     "css/css-fonts/standard-font-family-16.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-16-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-2.html": [
+    [
+     "css/css-fonts/standard-font-family-2.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-2-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-3.html": [
+    [
+     "css/css-fonts/standard-font-family-3.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-3-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-4.html": [
+    [
+     "css/css-fonts/standard-font-family-4.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-4-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-5.html": [
+    [
+     "css/css-fonts/standard-font-family-5.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-5-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-6.html": [
+    [
+     "css/css-fonts/standard-font-family-6.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-6-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-7.html": [
+    [
+     "css/css-fonts/standard-font-family-7.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-7-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-8.html": [
+    [
+     "css/css-fonts/standard-font-family-8.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-8-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family-9.html": [
+    [
+     "css/css-fonts/standard-font-family-9.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-9-notref.html",
+       "!="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/standard-font-family.html": [
+    [
+     "css/css-fonts/standard-font-family.html",
+     [
+      [
+       "/css/css-fonts/standard-font-family-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-fonts/variations/font-descriptor-range-reversed.html": [
     [
      "css/css-fonts/variations/font-descriptor-range-reversed.html",
@@ -124771,6 +124975,18 @@
      {}
     ]
    ],
+   "css/css-grid/alignment/grid-baseline-align-cycles-001.html": [
+    [
+     "css/css-grid/alignment/grid-baseline-align-cycles-001.html",
+     [
+      [
+       "/css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html": [
     [
      "css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html",
@@ -131292,7 +131508,7 @@
      "css/css-masking/clip-path-svg-content/clip-path-recursion-002.svg",
      [
       [
-       "/css/css-masking/clip-path-svg-content/reference/clip-path-invisible-ref.svg",
+       "/css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg",
        "=="
       ]
      ],
@@ -132235,6 +132451,18 @@
      {}
     ]
    ],
+   "css/css-masking/clip-path/clip-path-svg-invalidate.html": [
+    [
+     "css/css-masking/clip-path/clip-path-svg-invalidate.html",
+     [
+      [
+       "/css/css-masking/clip-path/clip-path-svg-invalidate-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-masking/clip-rule/clip-rule-001.html": [
     [
      "css/css-masking/clip-rule/clip-rule-001.html",
@@ -144383,6 +144611,18 @@
      {}
     ]
    ],
+   "css/css-sizing/ortho-writing-mode-001.html": [
+    [
+     "css/css-sizing/ortho-writing-mode-001.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-sizing/orthogonal-writing-mode-float-in-inline.html": [
     [
      "css/css-sizing/orthogonal-writing-mode-float-in-inline.html",
@@ -144395,6 +144635,18 @@
      {}
     ]
    ],
+   "css/css-sizing/percentage-resolution-001.html": [
+    [
+     "css/css-sizing/percentage-resolution-001.html",
+     [
+      [
+       "/css/css-sizing/percentage-resolution-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-sizing/range-percent-intrinsic-size-1.html": [
     [
      "css/css-sizing/range-percent-intrinsic-size-1.html",
@@ -207933,6 +208185,18 @@
      {}
     ]
    ],
+   "svg/struct/reftests/use-external-resource-with-revalidation.tentative.html": [
+    [
+     "svg/struct/reftests/use-external-resource-with-revalidation.tentative.html",
+     [
+      [
+       "/svg/struct/reftests/reference/green-100x100.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "svg/struct/reftests/use-svg-dimensions-override-001.svg": [
     [
      "svg/struct/reftests/use-svg-dimensions-override-001.svg",
@@ -212535,6 +212799,9 @@
    ".github/META.yml": [
     []
    ],
+   ".github/workflows/detect_pull_request_preview.yml": [
+    []
+   ],
    ".github/workflows/documentation.yml": [
     []
    ],
@@ -213450,6 +213717,9 @@
    "LICENSE.md": [
     []
    ],
+   "PeriodicBackgroundSync/service_workers/sw.js": [
+    []
+   ],
    "README.md": [
     []
    ],
@@ -229584,9 +229854,6 @@
    "cookie-store/resources/cookie_helper.py": [
     []
    ],
-   "cookie-store/resources/document_cookie.js": [
-    []
-   ],
    "cookie-store/resources/empty_sw.js": [
     []
    ],
@@ -229596,27 +229863,6 @@
    "cookie-store/resources/helpers.js": [
     []
    ],
-   "cookie-store/resources/http_cookie_and_set_cookie_headers.js": [
-    []
-   ],
-   "cookie-store/resources/no_name_and_no_value.js": [
-    []
-   ],
-   "cookie-store/resources/no_name_equals_in_value.js": [
-    []
-   ],
-   "cookie-store/resources/no_name_multiple_values.js": [
-    []
-   ],
-   "cookie-store/resources/ordering.js": [
-    []
-   ],
-   "cookie-store/serviceworker_cookieStore_arguments.js": [
-    []
-   ],
-   "cookie-store/serviceworker_cookieStore_basic.js": [
-    []
-   ],
    "cookie-store/serviceworker_cookieStore_cross_origin.js": [
     []
    ],
@@ -245082,6 +245328,15 @@
    "css/css-backgrounds/reference/ttwf-reftest-borderRadius-ref.html": [
     []
    ],
+   "css/css-backgrounds/resources/blue-100.png": [
+    []
+   ],
+   "css/css-backgrounds/resources/green-100.png": [
+    []
+   ],
+   "css/css-backgrounds/resources/stripes-100.png": [
+    []
+   ],
    "css/css-backgrounds/support/100x100-blue-and-orange.png": [
     []
    ],
@@ -247362,6 +247617,54 @@
    "css/css-fonts/quoted-generic-ignored-ref.html": [
     []
    ],
+   "css/css-fonts/standard-font-family-10-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-11-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-12-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-13-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-14-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-15-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-16-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-2-ref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-3-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-4-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-5-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-6-ref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-7-ref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-8-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-9-notref.html": [
+    []
+   ],
+   "css/css-fonts/standard-font-family-ref.html": [
+    []
+   ],
    "css/css-fonts/support/100x100-lime.png": [
     []
    ],
@@ -252168,9 +252471,6 @@
    "css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html": [
     []
    ],
-   "css/css-grid/abspos/support/grid.css": [
-    []
-   ],
    "css/css-grid/abspos/support/positioned-grid-descendants.css": [
     []
    ],
@@ -252183,6 +252483,9 @@
    "css/css-grid/alignment/grid-self-alignment-stretch-input-range-ref.html": [
     []
    ],
+   "css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html": [
+    []
+   ],
    "css/css-grid/alignment/support/100x100-green.png": [
     []
    ],
@@ -252204,9 +252507,6 @@
    "css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html": [
     []
    ],
-   "css/css-grid/grid-definition/support/grid.css": [
-    []
-   ],
    "css/css-grid/grid-definition/support/testing-utils.js": [
     []
    ],
@@ -252258,9 +252558,6 @@
    "css/css-grid/grid-items/support/50x50-green.png": [
     []
    ],
-   "css/css-grid/grid-items/support/grid.css": [
-    []
-   ],
    "css/css-grid/grid-model/grid-container-ignores-first-letter-002-ref.html": [
     []
    ],
@@ -252285,9 +252582,6 @@
    "css/css-grid/grid-model/reference/100x100-grey-box.html": [
     []
    ],
-   "css/css-grid/grid-model/support/grid.css": [
-    []
-   ],
    "css/css-grid/layout-algorithm/references/grid-percent-cols-filled-shrinkwrap-001-ref.html": [
     []
    ],
@@ -252921,6 +253215,9 @@
    "css/css-masking/clip-path-svg-content/reference/clip-path-precision-001-ref.svg": [
     []
    ],
+   "css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg": [
+    []
+   ],
    "css/css-masking/clip-path-svg-content/reference/clip-path-shape-inset-001-ref.svg": [
     []
    ],
@@ -252966,6 +253263,9 @@
    "css/css-masking/clip-path/clip-path-fixed-nested-ref.html": [
     []
    ],
+   "css/css-masking/clip-path/clip-path-svg-invalidate-ref.html": [
+    []
+   ],
    "css/css-masking/clip-path/reference/clip-path-circle-2-ref.html": [
     []
    ],
@@ -255060,6 +255360,12 @@
    "css/css-scroll-snap/scroll-target-001-ref.html": [
     []
    ],
+   "css/css-scroll-snap/support/common.css": [
+    []
+   ],
+   "css/css-scroll-snap/support/common.js": [
+    []
+   ],
    "css/css-scroll-snap/support/scroll-target-align-001-iframe.html": [
     []
    ],
@@ -255552,6 +255858,9 @@
    "css/css-sizing/intrinsic-size/resources/dice.png": [
     []
    ],
+   "css/css-sizing/percentage-resolution-001-ref.html": [
+    []
+   ],
    "css/css-sizing/range-percent-intrinsic-size-1-ref.html": [
     []
    ],
@@ -268191,9 +268500,6 @@
    "fetch/metadata/resources/xslt-test.sub.xml": [
     []
    ],
-   "fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.sub.headers": [
-    []
-   ],
    "fetch/nosniff/importscripts.js": [
     []
    ],
@@ -275940,6 +276246,9 @@
    "infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini": [
     []
    ],
+   "infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini": [
+    []
+   ],
    "infrastructure/metadata/infrastructure/testdriver/actions/pause.html.ini": [
     []
    ],
@@ -276294,9 +276603,6 @@
    "interfaces/picture-in-picture.idl": [
     []
    ],
-   "interfaces/pointerevents-extension.idl": [
-    []
-   ],
    "interfaces/pointerevents.idl": [
     []
    ],
@@ -280791,6 +281097,12 @@
    "resource-timing/resources/blank_page_green.htm.headers": [
     []
    ],
+   "resource-timing/resources/blue-with-tao.png": [
+    []
+   ],
+   "resource-timing/resources/blue-with-tao.png.headers": [
+    []
+   ],
    "resource-timing/resources/blue.png": [
     []
    ],
@@ -281349,6 +281661,12 @@
    "resources/test/tests/unit/late-test.html": [
     []
    ],
+   "resources/test/tests/unit/promise_setup-timeout.html": [
+    []
+   ],
+   "resources/test/tests/unit/promise_setup.html": [
+    []
+   ],
    "resources/test/tests/unit/single_test.html": [
     []
    ],
@@ -284004,9 +284322,18 @@
    "svg/shapes/reftests/reference/empty.svg": [
     []
    ],
+   "svg/struct/reftests/reference/green-100x100.html": [
+    []
+   ],
    "svg/struct/reftests/reference/green-100x100.svg": [
     []
    ],
+   "svg/struct/reftests/support/etag-max-age-zero-icons.svg": [
+    []
+   ],
+   "svg/struct/reftests/support/etag-max-age-zero-icons.svg.headers": [
+    []
+   ],
    "svg/struct/scripted/blank.svg": [
     []
    ],
@@ -284229,6 +284556,9 @@
    "tools/ci/manifest_build.py": [
     []
    ],
+   "tools/ci/pr_preview.py": [
+    []
+   ],
    "tools/ci/run_tc.py": [
     []
    ],
@@ -284241,6 +284571,9 @@
    "tools/ci/tests/test_jobs.py": [
     []
    ],
+   "tools/ci/tests/test_pr_preview.py": [
+    []
+   ],
    "tools/ci/tests/test_run_tc.py": [
     []
    ],
@@ -289134,9 +289467,6 @@
    "visual-viewport/helper-resize-event-on-load-overflowing-page.html": [
     []
    ],
-   "visual-viewport/viewport-no-resize-event-on-overflow-recalc.html.ini": [
-    []
-   ],
    "visual-viewport/viewport_support.js": [
     []
    ],
@@ -297951,23 +298281,6 @@
      }
     ]
    ],
-   "BackgroundSync/periodicsync.https.window.js": [
-    [
-     "BackgroundSync/periodicsync.https.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/common/get-host-info.sub.js"
-       ],
-       [
-        "script",
-        "/service-workers/service-worker/resources/test-helpers.sub.js"
-       ]
-      ]
-     }
-    ]
-   ],
    "FileAPI/FileReader/Progress_event_bubbles_cancelable.html": [
     [
      "FileAPI/FileReader/Progress_event_bubbles_cancelable.html",
@@ -301416,6 +301729,55 @@
      }
     ]
    ],
+   "PeriodicBackgroundSync/idlharness.https.any.js": [
+    [
+     "PeriodicBackgroundSync/idlharness.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "script",
+        "/resources/WebIDLParser.js"
+       ],
+       [
+        "script",
+        "/resources/idlharness.js"
+       ]
+      ]
+     }
+    ],
+    [
+     "PeriodicBackgroundSync/idlharness.https.any.worker.html",
+     {
+      "script_metadata": [
+       [
+        "script",
+        "/resources/WebIDLParser.js"
+       ],
+       [
+        "script",
+        "/resources/idlharness.js"
+       ]
+      ]
+     }
+    ]
+   ],
+   "PeriodicBackgroundSync/periodicsync.https.window.js": [
+    [
+     "PeriodicBackgroundSync/periodicsync.https.window.html",
+     {
+      "script_metadata": [
+       [
+        "script",
+        "/common/get-host-info.sub.js"
+       ],
+       [
+        "script",
+        "/service-workers/service-worker/resources/test-helpers.sub.js"
+       ]
+      ]
+     }
+    ]
+   ],
    "WebCryptoAPI/derive_bits_keys/ecdh_bits.https.any.js": [
     [
      "WebCryptoAPI/derive_bits_keys/ecdh_bits.https.any.html",
@@ -315354,33 +315716,222 @@
      {}
     ]
    ],
-   "cookie-store/cookieListItem_attributes.tentative.https.window.js": [
+   "cookie-store/change_eventhandler_for_document_cookie.tentative.https.window.js": [
     [
-     "cookie-store/cookieListItem_attributes.tentative.https.window.html",
-     {}
+     "cookie-store/change_eventhandler_for_document_cookie.tentative.https.window.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Observing 'change' events in document when cookies set via document.cookie"
+       ],
+       [
+        "script",
+        "resources/cookie-test-helpers.js"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/cookieStore_delete_arguments.tentative.https.window.js": [
+   "cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.tentative.https.window.js": [
     [
-     "cookie-store/cookieStore_delete_arguments.tentative.https.window.html",
-     {}
+     "cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.tentative.https.window.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Observing 'change' events in document when cookies set via Set-Cookie header"
+       ],
+       [
+        "script",
+        "resources/cookie-test-helpers.js"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/cookieStore_delete_basic.tentative.https.window.js": [
+   "cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.js": [
     [
-     "cookie-store/cookieStore_delete_basic.tentative.https.window.html",
-     {}
+     "cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Observing 'change' events in document when modifications API is called with blank arguments"
+       ],
+       [
+        "script",
+        "resources/cookie-test-helpers.js"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/cookieStore_delete_insecure.tentative.https.window.js": [
+   "cookie-store/change_eventhandler_for_no_name_equals_in_value.tentative.https.window.js": [
     [
-     "cookie-store/cookieStore_delete_insecure.tentative.https.window.html",
-     {}
+     "cookie-store/change_eventhandler_for_no_name_equals_in_value.tentative.https.window.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Observing 'change' events in document when setting a cookie value containing \"=\""
+       ],
+       [
+        "script",
+        "resources/cookie-test-helpers.js"
+       ]
+      ]
+     }
+    ]
+   ],
+   "cookie-store/change_eventhandler_for_no_name_multiple_values.tentative.https.window.js": [
+    [
+     "cookie-store/change_eventhandler_for_no_name_multiple_values.tentative.https.window.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Observing 'change' events in document when modifications API is called multiple times with a blank name"
+       ],
+       [
+        "script",
+        "resources/cookie-test-helpers.js"
+       ]
+      ]
+     }
+    ]
+   ],
+   "cookie-store/cookieListItem_attributes.tentative.https.any.js": [
+    [
+     "cookie-store/cookieListItem_attributes.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieListItem attributes"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieListItem_attributes.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieListItem attributes"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ]
+   ],
+   "cookie-store/cookieStore_delete_arguments.tentative.https.any.js": [
+    [
+     "cookie-store/cookieStore_delete_arguments.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.delete() arguments"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_delete_arguments.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.delete() arguments"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ]
+   ],
+   "cookie-store/cookieStore_delete_basic.tentative.https.any.js": [
+    [
+     "cookie-store/cookieStore_delete_basic.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.delete() return type"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_delete_basic.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.delete() return type"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ]
+   ],
+   "cookie-store/cookieStore_delete_insecure.tentative.https.any.js": [
+    [
+     "cookie-store/cookieStore_delete_insecure.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.delete() with insecure cookies"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_delete_insecure.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.delete() with insecure cookies"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/cookieStore_event_arguments.tenative.https.window.js": [
+   "cookie-store/cookieStore_event_arguments.tentative.https.window.js": [
     [
-     "cookie-store/cookieStore_event_arguments.tenative.https.window.html",
+     "cookie-store/cookieStore_event_arguments.tentative.https.window.html",
      {}
     ]
    ],
@@ -315402,34 +315953,164 @@
      {}
     ]
    ],
-   "cookie-store/cookieStore_getAll_arguments.tentative.https.window.js": [
+   "cookie-store/cookieStore_getAll_arguments.tentative.https.any.js": [
     [
-     "cookie-store/cookieStore_getAll_arguments.tentative.https.window.html",
-     {}
+     "cookie-store/cookieStore_getAll_arguments.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.getAll() arguments"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_getAll_arguments.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.getAll() arguments"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/cookieStore_getAll_multiple.tentative.https.window.js": [
+   "cookie-store/cookieStore_getAll_multiple.tentative.https.any.js": [
     [
-     "cookie-store/cookieStore_getAll_multiple.tentative.https.window.html",
-     {}
+     "cookie-store/cookieStore_getAll_multiple.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.getAll() with multiple cookies"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_getAll_multiple.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.getAll() with multiple cookies"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/cookieStore_getAll_set_basic.tentative.https.window.js": [
+   "cookie-store/cookieStore_getAll_set_basic.tentative.https.any.js": [
     [
-     "cookie-store/cookieStore_getAll_set_basic.tentative.https.window.html",
-     {}
+     "cookie-store/cookieStore_getAll_set_basic.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Interaction between cookieStore.set() and cookieStore.getAll()"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_getAll_set_basic.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Interaction between cookieStore.set() and cookieStore.getAll()"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/cookieStore_get_arguments.tentative.https.window.js": [
+   "cookie-store/cookieStore_get_arguments.tentative.https.any.js": [
     [
-     "cookie-store/cookieStore_get_arguments.tentative.https.window.html",
-     {}
+     "cookie-store/cookieStore_get_arguments.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.get() arguments"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_get_arguments.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.get() arguments"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/cookieStore_get_delete_basic.tentative.https.window.js": [
+   "cookie-store/cookieStore_get_delete_basic.tentative.https.any.js": [
     [
-     "cookie-store/cookieStore_get_delete_basic.tentative.https.window.html",
-     {}
+     "cookie-store/cookieStore_get_delete_basic.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Interaction between cookieStore.set() and cookieStore.delete()"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_get_delete_basic.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Interaction between cookieStore.set() and cookieStore.delete()"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
     ]
    ],
    "cookie-store/cookieStore_get_set_across_frames.tentative.https.html": [
@@ -315444,53 +316125,178 @@
      {}
     ]
    ],
-   "cookie-store/cookieStore_get_set_basic.tentative.https.window.js": [
+   "cookie-store/cookieStore_get_set_basic.tentative.https.any.js": [
     [
-     "cookie-store/cookieStore_get_set_basic.tentative.https.window.html",
-     {}
+     "cookie-store/cookieStore_get_set_basic.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Interaction between cookieStore.set() and cookieStore.get()"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_get_set_basic.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Interaction between cookieStore.set() and cookieStore.get()"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/cookieStore_in_detached_frame.tentative.https.html": [
+   "cookie-store/cookieStore_get_set_ordering.tentative.https.any.js": [
     [
-     "cookie-store/cookieStore_in_detached_frame.tentative.https.html",
-     {}
+     "cookie-store/cookieStore_get_set_ordering.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Cookie ordering"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_get_set_ordering.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: Cookie ordering"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/cookieStore_set_arguments.tentative.https.window.js": [
+   "cookie-store/cookieStore_in_detached_frame.tentative.https.html": [
     [
-     "cookie-store/cookieStore_set_arguments.tentative.https.window.html",
+     "cookie-store/cookieStore_in_detached_frame.tentative.https.html",
      {}
     ]
    ],
-   "cookie-store/cookieStore_special_names.tentative.https.window.js": [
+   "cookie-store/cookieStore_set_arguments.tentative.https.any.js": [
     [
-     "cookie-store/cookieStore_special_names.tentative.https.window.html",
-     {}
+     "cookie-store/cookieStore_set_arguments.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.set() arguments"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_set_arguments.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.set() arguments"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/document_cookie.tentative.https.html": [
+   "cookie-store/cookieStore_special_names.tentative.https.any.js": [
     [
-     "cookie-store/document_cookie.tentative.https.html",
-     {}
+     "cookie-store/cookieStore_special_names.tentative.https.any.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.set()/get()/delete() for cookies with special names"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
+    ],
+    [
+     "cookie-store/cookieStore_special_names.tentative.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookieStore.set()/get()/delete() for cookies with special names"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ]
+      ]
+     }
     ]
    ],
-   "cookie-store/encoding.https.window.js": [
+   "cookie-store/encoding.https.any.js": [
     [
-     "cookie-store/encoding.https.window.html",
+     "cookie-store/encoding.https.any.html",
      {
       "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookie encoding"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ],
        [
         "script",
         "resources/cookie-test-helpers.js"
        ]
       ]
      }
-    ]
-   ],
-   "cookie-store/http_cookie_and_set_cookie_headers.tentative.https.html": [
+    ],
     [
-     "cookie-store/http_cookie_and_set_cookie_headers.tentative.https.html",
-     {}
+     "cookie-store/encoding.https.any.serviceworker.html",
+     {
+      "script_metadata": [
+       [
+        "title",
+        "Cookie Store API: cookie encoding"
+       ],
+       [
+        "global",
+        "!default,serviceworker,window"
+       ],
+       [
+        "script",
+        "resources/cookie-test-helpers.js"
+       ]
+      ]
+     }
     ]
    ],
    "cookie-store/httponly_cookies.https.window.js": [
@@ -315564,42 +316370,6 @@
      }
     ]
    ],
-   "cookie-store/no_name_and_no_value.tentative.https.html": [
-    [
-     "cookie-store/no_name_and_no_value.tentative.https.html",
-     {}
-    ]
-   ],
-   "cookie-store/no_name_equals_in_value.tentative.https.html": [
-    [
-     "cookie-store/no_name_equals_in_value.tentative.https.html",
-     {}
-    ]
-   ],
-   "cookie-store/no_name_multiple_values.tentative.https.html": [
-    [
-     "cookie-store/no_name_multiple_values.tentative.https.html",
-     {}
-    ]
-   ],
-   "cookie-store/ordering.tentative.https.html": [
-    [
-     "cookie-store/ordering.tentative.https.html",
-     {}
-    ]
-   ],
-   "cookie-store/serviceworker_cookieStore_arguments.tentative.https.html": [
-    [
-     "cookie-store/serviceworker_cookieStore_arguments.tentative.https.html",
-     {}
-    ]
-   ],
-   "cookie-store/serviceworker_cookieStore_basic.tentative.https.html": [
-    [
-     "cookie-store/serviceworker_cookieStore_basic.tentative.https.html",
-     {}
-    ]
-   ],
    "cookie-store/serviceworker_cookieStore_cross_origin.tentative.https.sub.html": [
     [
      "cookie-store/serviceworker_cookieStore_cross_origin.tentative.https.sub.html",
@@ -316317,6 +317087,12 @@
      {}
     ]
    ],
+   "css/CSS2/linebox/animations/line-height-interpolation.html": [
+    [
+     "css/CSS2/linebox/animations/line-height-interpolation.html",
+     {}
+    ]
+   ],
    "css/CSS2/linebox/inline-children-root-linebox-crash-001.html": [
     [
      "css/CSS2/linebox/inline-children-root-linebox-crash-001.html",
@@ -317565,6 +318341,12 @@
      {}
     ]
    ],
+   "css/css-backgrounds/animations/background-image-interpolation.html": [
+    [
+     "css/css-backgrounds/animations/background-image-interpolation.html",
+     {}
+    ]
+   ],
    "css/css-backgrounds/animations/background-position-interpolation.html": [
     [
      "css/css-backgrounds/animations/background-position-interpolation.html",
@@ -325059,6 +325841,14 @@
      {}
     ]
    ],
+   "css/css-scroll-snap/input/keyboard.html": [
+    [
+     "css/css-scroll-snap/input/keyboard.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "css/css-scroll-snap/nested-scrollIntoView-snaps.html": [
     [
      "css/css-scroll-snap/nested-scrollIntoView-snaps.html",
@@ -325281,6 +326071,12 @@
      {}
     ]
    ],
+   "css/css-scroll-snap/snap-area-caputring-add-scroll-container.html": [
+    [
+     "css/css-scroll-snap/snap-area-caputring-add-scroll-container.html",
+     {}
+    ]
+   ],
    "css/css-scroll-snap/snap-inline-block.html": [
     [
      "css/css-scroll-snap/snap-inline-block.html",
@@ -329607,6 +330403,18 @@
      {}
     ]
    ],
+   "css/css-transitions/animations/vertical-align-interpolation.html": [
+    [
+     "css/css-transitions/animations/vertical-align-interpolation.html",
+     {}
+    ]
+   ],
+   "css/css-transitions/animations/z-index-interpolation.html": [
+    [
+     "css/css-transitions/animations/z-index-interpolation.html",
+     {}
+    ]
+   ],
    "css/css-transitions/before-load-001.html": [
     [
      "css/css-transitions/before-load-001.html",
@@ -333777,6 +334585,12 @@
      {}
     ]
    ],
+   "css/cssom-view/scrollIntoView-horizontal-partially-visible.html": [
+    [
+     "css/cssom-view/scrollIntoView-horizontal-partially-visible.html",
+     {}
+    ]
+   ],
    "css/cssom-view/scrollIntoView-horizontal-tb-writing-mode-and-rtl-direction.html": [
     [
      "css/cssom-view/scrollIntoView-horizontal-tb-writing-mode-and-rtl-direction.html",
@@ -353262,254 +354076,6 @@
      {}
     ]
    ],
-   "fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/frame.tentative.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/frame.tentative.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/navigation.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/navigation.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/portal.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/portal.tentative.https.sub.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/script.tentative.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/script.tentative.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/unload.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/unload.tentative.https.sub.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/window-open.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/window-open.tentative.https.sub.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html",
-     {}
-    ]
-   ],
-   "fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html": [
-    [
-     "fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html",
-     {}
-    ]
-   ],
    "fetch/metadata/serviceworker.tentative.https.sub.html": [
     [
      "fetch/metadata/serviceworker.tentative.https.sub.html",
@@ -358571,6 +359137,18 @@
      {}
     ]
    ],
+   "html/semantics/document-metadata/the-link-element/link-multiple-error-events.html": [
+    [
+     "html/semantics/document-metadata/the-link-element/link-multiple-error-events.html",
+     {}
+    ]
+   ],
+   "html/semantics/document-metadata/the-link-element/link-multiple-load-events.html": [
+    [
+     "html/semantics/document-metadata/the-link-element/link-multiple-load-events.html",
+     {}
+    ]
+   ],
    "html/semantics/document-metadata/the-link-element/link-rel-attribute.html": [
     [
      "html/semantics/document-metadata/the-link-element/link-rel-attribute.html",
@@ -368980,6 +369558,12 @@
      {}
     ]
    ],
+   "html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html": [
+    [
+     "html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html",
+     {}
+    ]
+   ],
    "html/webappapis/the-windoworworkerglobalscope-mixin/Worker_Self_Origin.html": [
     [
      "html/webappapis/the-windoworworkerglobalscope-mixin/Worker_Self_Origin.html",
@@ -369346,6 +369930,12 @@
      {}
     ]
    ],
+   "import-maps/core/not-as-classic-script.html": [
+    [
+     "import-maps/core/not-as-classic-script.html",
+     {}
+    ]
+   ],
    "import-maps/csp/applied-to-target-dynamic.sub.tentative.html": [
     [
      "import-maps/csp/applied-to-target-dynamic.sub.tentative.html",
@@ -369470,6 +370060,12 @@
      {}
     ]
    ],
+   "inert/inert-on-slots.tentative.html": [
+    [
+     "inert/inert-on-slots.tentative.html",
+     {}
+    ]
+   ],
    "inert/inert-retargeting-iframe.tentative.html": [
     [
      "inert/inert-retargeting-iframe.tentative.html",
@@ -369921,6 +370517,14 @@
      }
     ]
    ],
+   "infrastructure/testdriver/actions/multiTouchPointsWithPause.html": [
+    [
+     "infrastructure/testdriver/actions/multiTouchPointsWithPause.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "infrastructure/testdriver/actions/pause.html": [
     [
      "infrastructure/testdriver/actions/pause.html",
@@ -370340,6 +370944,12 @@
      {}
     ]
    ],
+   "intersection-observer/v2/position-relative.html": [
+    [
+     "intersection-observer/v2/position-relative.html",
+     {}
+    ]
+   ],
    "intersection-observer/v2/scaled-target.html": [
     [
      "intersection-observer/v2/scaled-target.html",
@@ -371609,11 +372219,27 @@
    "media-capabilities/decodingInfo.any.js": [
     [
      "media-capabilities/decodingInfo.any.html",
-     {}
+     {
+      "script_metadata": [
+       [
+        "timeout",
+        "long"
+       ]
+      ],
+      "timeout": "long"
+     }
     ],
     [
      "media-capabilities/decodingInfo.any.worker.html",
-     {}
+     {
+      "script_metadata": [
+       [
+        "timeout",
+        "long"
+       ]
+      ],
+      "timeout": "long"
+     }
     ]
    ],
    "media-capabilities/decodingInfoEncryptedMedia.http.html": [
@@ -371625,7 +372251,9 @@
    "media-capabilities/decodingInfoEncryptedMedia.https.html": [
     [
      "media-capabilities/decodingInfoEncryptedMedia.https.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "media-capabilities/encodingInfo.html": [
@@ -387653,99 +388281,20 @@
      }
     ]
    ],
-   "pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html": [
-    [
-     "pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "pointerevents/extension/idlharness.window.js": [
+   "pointerevents/compat/pointerevent_touch-action-verification.html": [
     [
-     "pointerevents/extension/idlharness.window.html",
-     {
-      "script_metadata": [
-       [
-        "script",
-        "/resources/WebIDLParser.js"
-       ],
-       [
-        "script",
-        "/resources/idlharness.js"
-       ]
-      ]
-     }
-    ]
-   ],
-   "pointerevents/extension/pointerevent_coalesced_events_attributes.html": [
-    [
-     "pointerevents/extension/pointerevent_coalesced_events_attributes.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "pointerevents/extension/pointerevent_constructor.html": [
-    [
-     "pointerevents/extension/pointerevent_constructor.html",
+     "pointerevents/compat/pointerevent_touch-action-verification.html",
      {}
     ]
    ],
-   "pointerevents/extension/pointerevent_getCoalescedEvents_when_pointerlocked.html": [
-    [
-     "pointerevents/extension/pointerevent_getCoalescedEvents_when_pointerlocked.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "pointerevents/extension/pointerevent_pointerrawupdate.html": [
-    [
-     "pointerevents/extension/pointerevent_pointerrawupdate.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "pointerevents/extension/pointerevent_touch-action-pan-down-css_touch.html": [
-    [
-     "pointerevents/extension/pointerevent_touch-action-pan-down-css_touch.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "pointerevents/extension/pointerevent_touch-action-pan-left-css_touch.html": [
-    [
-     "pointerevents/extension/pointerevent_touch-action-pan-left-css_touch.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "pointerevents/extension/pointerevent_touch-action-pan-right-css_touch.html": [
-    [
-     "pointerevents/extension/pointerevent_touch-action-pan-right-css_touch.html",
-     {
-      "testdriver": true
-     }
-    ]
-   ],
-   "pointerevents/extension/pointerevent_touch-action-pan-up-css_touch.html": [
+   "pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html": [
     [
-     "pointerevents/extension/pointerevent_touch-action-pan-up-css_touch.html",
+     "pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html",
      {
       "testdriver": true
      }
     ]
    ],
-   "pointerevents/extension/pointerevent_touch-action-verification.html": [
-    [
-     "pointerevents/extension/pointerevent_touch-action-verification.html",
-     {}
-    ]
-   ],
    "pointerevents/idlharness.window.js": [
     [
      "pointerevents/idlharness.window.html",
@@ -387843,6 +388392,14 @@
      }
     ]
    ],
+   "pointerevents/pointerevent_coalesced_events_attributes.html": [
+    [
+     "pointerevents/pointerevent_coalesced_events_attributes.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "pointerevents/pointerevent_constructor.html": [
     [
      "pointerevents/pointerevent_constructor.html",
@@ -388000,6 +388557,14 @@
      }
     ]
    ],
+   "pointerevents/pointerevent_pointerrawupdate.html": [
+    [
+     "pointerevents/pointerevent_pointerrawupdate.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "pointerevents/pointerevent_releasepointercapture_events_to_original_target.html": [
     [
      "pointerevents/pointerevent_releasepointercapture_events_to_original_target.html",
@@ -388196,6 +388761,38 @@
      }
     ]
    ],
+   "pointerevents/pointerevent_touch-action-pan-down-css_touch.html": [
+    [
+     "pointerevents/pointerevent_touch-action-pan-down-css_touch.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "pointerevents/pointerevent_touch-action-pan-left-css_touch.html": [
+    [
+     "pointerevents/pointerevent_touch-action-pan-left-css_touch.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "pointerevents/pointerevent_touch-action-pan-right-css_touch.html": [
+    [
+     "pointerevents/pointerevent_touch-action-pan-right-css_touch.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
+   "pointerevents/pointerevent_touch-action-pan-up-css_touch.html": [
+    [
+     "pointerevents/pointerevent_touch-action-pan-up-css_touch.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "pointerevents/pointerevent_touch-action-pan-x-css_touch.html": [
     [
      "pointerevents/pointerevent_touch-action-pan-x-css_touch.html",
@@ -388270,6 +388867,14 @@
      }
     ]
    ],
+   "pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html": [
+    [
+     "pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "pointerevents/pointerlock/pointerevent_movementxy.html": [
     [
      "pointerevents/pointerlock/pointerevent_movementxy.html",
@@ -404159,13 +404764,17 @@
    "screen-capture/feature-policy.https.html": [
     [
      "screen-capture/feature-policy.https.html",
-     {}
+     {
+      "testdriver": true
+     }
     ]
    ],
    "screen-capture/getdisplaymedia.https.html": [
     [
      "screen-capture/getdisplaymedia.https.html",
-     {}
+     {
+      "testdriver": true
+     }
     ]
    ],
    "screen-capture/historical.https.html": [
@@ -406115,12 +406724,6 @@
      {}
     ]
    ],
-   "service-workers/service-worker/referer-toplevel-script-fetch.https.html": [
-    [
-     "service-workers/service-worker/referer-toplevel-script-fetch.https.html",
-     {}
-    ]
-   ],
    "service-workers/service-worker/referer.https.html": [
     [
      "service-workers/service-worker/referer.https.html",
@@ -406133,6 +406736,14 @@
      {}
     ]
    ],
+   "service-workers/service-worker/referrer-toplevel-script-fetch.https.html": [
+    [
+     "service-workers/service-worker/referrer-toplevel-script-fetch.https.html",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
    "service-workers/service-worker/register-closed-window.https.html": [
     [
      "service-workers/service-worker/register-closed-window.https.html",
@@ -406833,6 +407444,12 @@
      {}
     ]
    ],
+   "shadow-dom/innerHTML-setter.xhtml": [
+    [
+     "shadow-dom/innerHTML-setter.xhtml",
+     {}
+    ]
+   ],
    "shadow-dom/input-element-list.html": [
     [
      "shadow-dom/input-element-list.html",
@@ -415831,6 +416448,12 @@
      {}
     ]
    ],
+   "trusted-types/TrustedType-AttributeNodes.tentative.html": [
+    [
+     "trusted-types/TrustedType-AttributeNodes.tentative.html",
+     {}
+    ]
+   ],
    "trusted-types/TrustedTypePolicy-CSP-no-name.tentative.html": [
     [
      "trusted-types/TrustedTypePolicy-CSP-no-name.tentative.html",
@@ -415897,6 +416520,12 @@
      {}
     ]
    ],
+   "trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html": [
+    [
+     "trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html",
+     {}
+    ]
+   ],
    "trusted-types/TrustedTypePolicyFactory-defaultPolicy.tentative.html": [
     [
      "trusted-types/TrustedTypePolicyFactory-defaultPolicy.tentative.html",
@@ -423358,6 +423987,12 @@
      {}
     ]
    ],
+   "web-animations/animation-model/combining-effects/applying-interpolated-transform.html": [
+    [
+     "web-animations/animation-model/combining-effects/applying-interpolated-transform.html",
+     {}
+    ]
+   ],
    "web-animations/animation-model/combining-effects/applying-the-composited-result.html": [
     [
      "web-animations/animation-model/combining-effects/applying-the-composited-result.html",
@@ -424986,9 +425621,9 @@
      }
     ]
    ],
-   "webaudio/the-audio-api/processing-model/cycle-witout-delay.html": [
+   "webaudio/the-audio-api/processing-model/cycle-without-delay.html": [
     [
-     "webaudio/the-audio-api/processing-model/cycle-witout-delay.html",
+     "webaudio/the-audio-api/processing-model/cycle-without-delay.html",
      {}
     ]
    ],
@@ -425860,6 +426495,12 @@
      {}
     ]
    ],
+   "webaudio/the-audio-api/the-destinationnode-interface/destination.html": [
+    [
+     "webaudio/the-audio-api/the-destinationnode-interface/destination.html",
+     {}
+    ]
+   ],
    "webaudio/the-audio-api/the-dynamicscompressornode-interface/ctor-dynamicscompressor.html": [
     [
      "webaudio/the-audio-api/the-dynamicscompressornode-interface/ctor-dynamicscompressor.html",
@@ -459158,7 +459799,7 @@
  },
  "paths": {
   ".azure-pipelines.yml": [
-   "82d5a899193681673c5b3843cccdc5f1a67a17ed",
+   "fa0dc670502745aa98ec5d86461f2a17ac8e329f",
    "support"
   ],
   ".codecov.yml": [
@@ -459173,12 +459814,16 @@
    "19878fa5991f4828d18df719f2eb51566fd4dfcb",
    "support"
   ],
+  ".github/workflows/detect_pull_request_preview.yml": [
+   "d35105d9e3e8841e135bd56e9c387fcba0d86a9a",
+   "support"
+  ],
   ".github/workflows/documentation.yml": [
    "9352fb81e2c5fbdc64f20c202b386c66795a6083",
    "support"
   ],
   ".github/workflows/epochs.yml": [
-   "5000d4c3dc437642fc037a029a42a2b7fe008bb1",
+   "78aaf16d18a43c4baaf4512d067acc3b16c75e27",
    "support"
   ],
   ".github/workflows/manifest.yml": [
@@ -463634,15 +464279,11 @@
    "support"
   ],
   "BackgroundSync/idlharness.https.any.js": [
-   "2c7d25dd3f6dae9fd044a94f1407d57754294195",
-   "testharness"
-  ],
-  "BackgroundSync/periodicsync.https.window.js": [
-   "4c8d2eb5f4241e5ecdf6efd85a24056bf575d8b0",
+   "8d4b9a583f484741f4cd4e4940833a890c612656",
    "testharness"
   ],
   "BackgroundSync/service_workers/sw.js": [
-   "ea2bab28c5a286757da1169ad32762209edbdb6f",
+   "c8515ba496420cb033e5ba52a19eaebf814860fe",
    "support"
   ],
   "CODEOWNERS": [
@@ -465290,7 +465931,7 @@
    "testharness"
   ],
   "IndexedDB/key_invalid.htm": [
-   "30759d5ef3e594852990808621ce75c840d0ac39",
+   "98c9140df9ff56f6304d0b997433048d0836a186",
    "testharness"
   ],
   "IndexedDB/key_valid.html": [
@@ -465505,6 +466146,18 @@
    "ad4858c8745cfa1b330a52d27c621a09aa3112e0",
    "support"
   ],
+  "PeriodicBackgroundSync/idlharness.https.any.js": [
+   "b0fc2a2d6c8e85fb7985683f88c25136aa2c3fdf",
+   "testharness"
+  ],
+  "PeriodicBackgroundSync/periodicsync.https.window.js": [
+   "30384e0b3e4dd4b42dd627dc0d1ef69c63e6bc87",
+   "testharness"
+  ],
+  "PeriodicBackgroundSync/service_workers/sw.js": [
+   "87351c1d2ffaf1702e1fbdf3a60a8c5a2cd8956d",
+   "support"
+  ],
   "README.md": [
    "8f755f2ac2fc88e012b32803fc65a68baa538596",
    "support"
@@ -465854,7 +466507,7 @@
    "support"
   ],
   "WebIDL/current-realm.html": [
-   "e094624c679202bd7035ed1593d83b2686360347",
+   "29e07d1f79edc05d69ccc351247894984488ad92",
    "testharness"
   ],
   "WebIDL/ecmascript-binding/constructors.html": [
@@ -465922,7 +466575,7 @@
    "testharness"
   ],
   "WebIDL/ecmascript-binding/sequence-conversion.html": [
-   "f878a2672e3082c4f617bbb314cf2de84266f729",
+   "3b45310dd5faa9bc5277e8d6032d159f375eefcd",
    "testharness"
   ],
   "WebIDL/ecmascript-binding/support/constructors-support.html": [
@@ -491341,23 +491994,43 @@
    "c406dcc774e0df8f7805c21cd7421fb0facedf28",
    "support"
   ],
-  "cookie-store/cookieListItem_attributes.tentative.https.window.js": [
-   "bf8f845f2b183202efc6405c510eb348db189894",
+  "cookie-store/change_eventhandler_for_document_cookie.tentative.https.window.js": [
+   "0a8b1bd21efc9b0ac69468ad81c306757e5b18ff",
+   "testharness"
+  ],
+  "cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.tentative.https.window.js": [
+   "2028df5b4bf4611f565e223579b6673a0d368483",
+   "testharness"
+  ],
+  "cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.js": [
+   "fbf3acecd26ec067c9df46fac90461c982bb1eaa",
+   "testharness"
+  ],
+  "cookie-store/change_eventhandler_for_no_name_equals_in_value.tentative.https.window.js": [
+   "f1abb02ebc0b01ac49e125bb796dd1445c4e2ad5",
    "testharness"
   ],
-  "cookie-store/cookieStore_delete_arguments.tentative.https.window.js": [
-   "dc073d8eb60321bdf5b15d67af6989dc672f21b1",
+  "cookie-store/change_eventhandler_for_no_name_multiple_values.tentative.https.window.js": [
+   "60c6c16518ae767d2dab68e62af8967b9890072b",
    "testharness"
   ],
-  "cookie-store/cookieStore_delete_basic.tentative.https.window.js": [
-   "8a3f7ed66da0cc7d6e6d2e07a3d6fa345e28d9b3",
+  "cookie-store/cookieListItem_attributes.tentative.https.any.js": [
+   "1b1ae529767fdb2744f31fd860bb881d2b744735",
    "testharness"
   ],
-  "cookie-store/cookieStore_delete_insecure.tentative.https.window.js": [
-   "bb1907faf58dfd4edfaf523f89ecad17785804bd",
+  "cookie-store/cookieStore_delete_arguments.tentative.https.any.js": [
+   "3a2b512bb1001864ea27a0fc66a267371976c501",
    "testharness"
   ],
-  "cookie-store/cookieStore_event_arguments.tenative.https.window.js": [
+  "cookie-store/cookieStore_delete_basic.tentative.https.any.js": [
+   "394e6ecc64ef4497fe2a5b55c463fc547ee686c2",
+   "testharness"
+  ],
+  "cookie-store/cookieStore_delete_insecure.tentative.https.any.js": [
+   "911e2fbac556080ea31bedd74acf8542356454b5",
+   "testharness"
+  ],
+  "cookie-store/cookieStore_event_arguments.tentative.https.window.js": [
    "bcb698eeb0d6ce760033ba628120ebf7772a1084",
    "testharness"
   ],
@@ -491373,24 +492046,24 @@
    "3acffea41c1d6a08e5aaf1ca944567347d174de0",
    "testharness"
   ],
-  "cookie-store/cookieStore_getAll_arguments.tentative.https.window.js": [
-   "a04aa8cd7ad65a56a56d3de53fa4d92192c7f05a",
+  "cookie-store/cookieStore_getAll_arguments.tentative.https.any.js": [
+   "6073fca3deb0e9ebdaf522ca895829eb869371eb",
    "testharness"
   ],
-  "cookie-store/cookieStore_getAll_multiple.tentative.https.window.js": [
-   "c09f4fc5f5794d44b61159f6a18de85cd0c57da7",
+  "cookie-store/cookieStore_getAll_multiple.tentative.https.any.js": [
+   "1b094af67b04abeffefb3588c7e74186f76d1112",
    "testharness"
   ],
-  "cookie-store/cookieStore_getAll_set_basic.tentative.https.window.js": [
-   "dd2adabd22835d135198d7b5c3cdb5d18b7e27a5",
+  "cookie-store/cookieStore_getAll_set_basic.tentative.https.any.js": [
+   "f1be8208f3862360a30b05d2b16dcee63418b2aa",
    "testharness"
   ],
-  "cookie-store/cookieStore_get_arguments.tentative.https.window.js": [
-   "e338dd1bdbd098373765dcc048425899c5cbe490",
+  "cookie-store/cookieStore_get_arguments.tentative.https.any.js": [
+   "73932c9bd5ddc0352b0a7cc19b9f13dbe3b30bad",
    "testharness"
   ],
-  "cookie-store/cookieStore_get_delete_basic.tentative.https.window.js": [
-   "5ebf09d34463250d2eeec80606b89a6ce46298e0",
+  "cookie-store/cookieStore_get_delete_basic.tentative.https.any.js": [
+   "fad175d8da798709b84259c51899608e0ffd26ce",
    "testharness"
   ],
   "cookie-store/cookieStore_get_set_across_frames.tentative.https.html": [
@@ -491401,32 +492074,28 @@
    "c67ef98bcc944dbfb815993734dcfae7dbd3eb9d",
    "testharness"
   ],
-  "cookie-store/cookieStore_get_set_basic.tentative.https.window.js": [
-   "deb7405f2ff0ddc29214a51b80878f7b17ce66fa",
+  "cookie-store/cookieStore_get_set_basic.tentative.https.any.js": [
+   "79d2f4321de0439583f14c50114075429d41c504",
    "testharness"
   ],
-  "cookie-store/cookieStore_in_detached_frame.tentative.https.html": [
-   "08a7b5b8e4629440956943489dd7fa7ca200b537",
+  "cookie-store/cookieStore_get_set_ordering.tentative.https.any.js": [
+   "0ec3feff2056732be48d4a6696a2524fbd252196",
    "testharness"
   ],
-  "cookie-store/cookieStore_set_arguments.tentative.https.window.js": [
-   "ddc9981c92ddf5d3b149249db1accd16dc476ec1",
-   "testharness"
-  ],
-  "cookie-store/cookieStore_special_names.tentative.https.window.js": [
-   "c82883a6069e7202ddfc2ccb248bab92cab7cb53",
+  "cookie-store/cookieStore_in_detached_frame.tentative.https.html": [
+   "08a7b5b8e4629440956943489dd7fa7ca200b537",
    "testharness"
   ],
-  "cookie-store/document_cookie.tentative.https.html": [
-   "63ddd9f63bc44103fd58bf488b03669684528a43",
+  "cookie-store/cookieStore_set_arguments.tentative.https.any.js": [
+   "9fd592d27cca4ed6aef648dfd0dbca473b911097",
    "testharness"
   ],
-  "cookie-store/encoding.https.window.js": [
-   "f79b81d272c206109abf4cd676b5fd6107ea2841",
+  "cookie-store/cookieStore_special_names.tentative.https.any.js": [
+   "a4b31178ab0977e96e86e45b550712b862c6d2c7",
    "testharness"
   ],
-  "cookie-store/http_cookie_and_set_cookie_headers.tentative.https.html": [
-   "0c3d8b12d46ab587bf9e4f0a6c38768f06cd792d",
+  "cookie-store/encoding.https.any.js": [
+   "41ce747f8145ace74a9986120d5afaa2a6c93d88",
    "testharness"
   ],
   "cookie-store/httponly_cookies.https.window.js": [
@@ -491437,22 +492106,6 @@
    "0c7a5150237910b1af301f91f782f300c713071a",
    "testharness"
   ],
-  "cookie-store/no_name_and_no_value.tentative.https.html": [
-   "0f15dafa7ab6e1f1a14afacea512b2491a669c70",
-   "testharness"
-  ],
-  "cookie-store/no_name_equals_in_value.tentative.https.html": [
-   "de774550fe91ee7c02643789686f1cad320f8163",
-   "testharness"
-  ],
-  "cookie-store/no_name_multiple_values.tentative.https.html": [
-   "29cde813fc35deff841313b0d681e29fe279ea80",
-   "testharness"
-  ],
-  "cookie-store/ordering.tentative.https.html": [
-   "1873ed4e9c0d3efe80cf671ed384eb2007c190c8",
-   "testharness"
-  ],
   "cookie-store/resources/cookie-test-helpers.js": [
    "178947ad6eca72967aa9bbc3a13172a0402bc17d",
    "support"
@@ -491461,10 +492114,6 @@
    "cf48f26eed1661b8e0f85a4ea8029b2f0b8d2e2d",
    "support"
   ],
-  "cookie-store/resources/document_cookie.js": [
-   "980347f1d185649ad4366f4d86fb03c030baa03f",
-   "support"
-  ],
   "cookie-store/resources/empty_sw.js": [
    "2b0ae226121503789d63d405670becb09e51b833",
    "support"
@@ -491477,42 +492126,6 @@
    "8d5dddef6577fc534a68c9e8415854e4c64901fd",
    "support"
   ],
-  "cookie-store/resources/http_cookie_and_set_cookie_headers.js": [
-   "0fcf6b604290ddbdb165502e9fc514e20990b47b",
-   "support"
-  ],
-  "cookie-store/resources/no_name_and_no_value.js": [
-   "e0c11a6cb65b5b9368d44eeee90da587c222b298",
-   "support"
-  ],
-  "cookie-store/resources/no_name_equals_in_value.js": [
-   "b6cfab5256214a58526ee1a2fe8a950846ef5a86",
-   "support"
-  ],
-  "cookie-store/resources/no_name_multiple_values.js": [
-   "51ea5281c2ce1be04d616fa282100bb96d43a75c",
-   "support"
-  ],
-  "cookie-store/resources/ordering.js": [
-   "86babd95edbcfcfd75b120cda5936d24679be188",
-   "support"
-  ],
-  "cookie-store/serviceworker_cookieStore_arguments.js": [
-   "7e19c9851390800f55cd505727ed3124fda190cf",
-   "support"
-  ],
-  "cookie-store/serviceworker_cookieStore_arguments.tentative.https.html": [
-   "7d006926dac7883deb5e92b01bcc103ab3e1ea83",
-   "testharness"
-  ],
-  "cookie-store/serviceworker_cookieStore_basic.js": [
-   "7461ef5f98d0bee30ff14f8b7bf31c06c18746e1",
-   "support"
-  ],
-  "cookie-store/serviceworker_cookieStore_basic.tentative.https.html": [
-   "379a8d764216ea7479c0df44f7e8dd1b87f149ab",
-   "testharness"
-  ],
   "cookie-store/serviceworker_cookieStore_cross_origin.js": [
    "ac59b703dd75656adb7ad248a4826ef0983a3c4c",
    "support"
@@ -518037,6 +518650,10 @@
    "4a3318f1cdc7c7cf3edb8bcab8cfdaef655bf765",
    "reftest"
   ],
+  "css/CSS2/linebox/animations/line-height-interpolation.html": [
+   "db71ca0262ca3fcf88178d1b7e2a42c6513cc1fb",
+   "testharness"
+  ],
   "css/CSS2/linebox/anonymous-inline-inherit-001-ref.html": [
    "e97da2169d55e5dec9a2888cb534bc7321a1c5e1",
    "support"
@@ -555125,6 +555742,10 @@
    "bb727d8e4ef3328547a746c31340b6ca2b885f5c",
    "testharness"
   ],
+  "css/css-backgrounds/animations/background-image-interpolation.html": [
+   "b442c4e9120f72ecf1e61365e7483ae6c3003ff8",
+   "testharness"
+  ],
   "css/css-backgrounds/animations/background-position-interpolation.html": [
    "2e7f2e24a1db1c6dd34033a753327e0ed3b08276",
    "testharness"
@@ -558517,6 +559138,18 @@
    "dcb590dfea60d956f7c945519396d2434e21d298",
    "support"
   ],
+  "css/css-backgrounds/resources/blue-100.png": [
+   "f578ae72533c7746c8a4d2f6eef32a8137ee1f4b",
+   "support"
+  ],
+  "css/css-backgrounds/resources/green-100.png": [
+   "e45bbbe5c5760d905db4bf015b5b7faa27467c7f",
+   "support"
+  ],
+  "css/css-backgrounds/resources/stripes-100.png": [
+   "cfb6980439ae80abb5a93e392421e8c6d4cfdae2",
+   "support"
+  ],
   "css/css-backgrounds/scroll-positioned-multiple-background-images.html": [
    "ff8e50b9cc49068698d7ca73489005c2cae1bf16",
    "reftest"
@@ -559013,6 +559646,10 @@
    "9db70b74a01ae9bb080425d8554603eda001dccc",
    "testharness"
   ],
+  "css/css-break/avoid-border-break.html": [
+   "56f47e83c57f0914b87910870d67d5490d9e4eb3",
+   "reftest"
+  ],
   "css/css-break/block-end-aligned-abspos-nested.html": [
    "b74a28e7319bad9f70a404bb613513778f42615f",
    "reftest"
@@ -568977,6 +569614,134 @@
    "4207ad5cf43e6b6db198fb14b0d00f6c3c2d4e97",
    "reftest"
   ],
+  "css/css-fonts/standard-font-family-10-notref.html": [
+   "e977fdaf7647400d18b975247d42b239a37e540c",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-10.html": [
+   "5dde6348d3985307999572b342433cfc8f800d9c",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-11-notref.html": [
+   "7e876ced31324f0cd7badb15641e9c0625bbe5e4",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-11.html": [
+   "15abb9a30ae6fb79b072ac79743c8e019900d24f",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-12-notref.html": [
+   "7e876ced31324f0cd7badb15641e9c0625bbe5e4",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-12.html": [
+   "7c34b0b8ca3cfdaab25ecfa930349b649f3c7a82",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-13-notref.html": [
+   "7e876ced31324f0cd7badb15641e9c0625bbe5e4",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-13.html": [
+   "1f8186f482ddb0aef05c5b3477f0037d3f14b7c3",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-14-notref.html": [
+   "7e876ced31324f0cd7badb15641e9c0625bbe5e4",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-14.html": [
+   "5b694ef09b3271cd8524d1b3d882838a1e9eb175",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-15-notref.html": [
+   "7e876ced31324f0cd7badb15641e9c0625bbe5e4",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-15.html": [
+   "2e21b833c96237a6f0f2e272dd5ee11ece192940",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-16-notref.html": [
+   "7e876ced31324f0cd7badb15641e9c0625bbe5e4",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-16.html": [
+   "0b470bd6407c8ff741c10497650f008b772d8126",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-2-ref.html": [
+   "e19801ba77086541fa50aba88493f13b3e60be6d",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-2.html": [
+   "4fbca52b659329fe00c599cf3677d39f0f86334b",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-3-notref.html": [
+   "766851077ed8cd490d06b9c56d51439e4f94dbf3",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-3.html": [
+   "38d2410a438f298416ba6f82f54510583233d9ce",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-4-notref.html": [
+   "bd3b02926745a1ebe98b54e59d0b5706fad1d448",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-4.html": [
+   "11146c9b71d5802661d54ff27b700d2bd213b9c5",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-5-notref.html": [
+   "531ac6cd9b2848ada69fcabeb8849a0205c6989c",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-5.html": [
+   "7d2646bb1b712099ef9ccde25450e02b336c809e",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-6-ref.html": [
+   "e9e24dfc62cfea8760c39bc7b8fe31e0d3261700",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-6.html": [
+   "9a5fd418bda32df3d53098a479f6d4cd6dd33224",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-7-ref.html": [
+   "4dad37fed3d92aecb50b98504f38c2590be6808d",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-7.html": [
+   "68ebe0e04e6a625e3acfe9812a044d21f9bb360e",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-8-notref.html": [
+   "00aa33cbab9931d31aec642ddebd908439649b9b",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-8.html": [
+   "b64cb8fb4cc0912e08f4747d95fe4f07454d3548",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-9-notref.html": [
+   "b9d1569e533605fc7883e71860afb55f35468482",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family-9.html": [
+   "e5afe8ab9ae55ede92e28cbb4451843655a1ba12",
+   "reftest"
+  ],
+  "css/css-fonts/standard-font-family-ref.html": [
+   "e9e24dfc62cfea8760c39bc7b8fe31e0d3261700",
+   "support"
+  ],
+  "css/css-fonts/standard-font-family.html": [
+   "907a437207c8d406746b6bb9733946a81a354a8d",
+   "reftest"
+  ],
   "css/css-fonts/support/100x100-lime.png": [
    "1b947700808585e8c224cee096247eb5d30a1ded",
    "support"
@@ -575450,11 +576215,11 @@
    "testharness"
   ],
   "css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html": [
-   "4be43ddba2dec27a1dd2d1af95402e5158c7c9e6",
+   "4906638ee1da8428ee4d0e74bec4de83baf4f39c",
    "testharness"
   ],
   "css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html": [
-   "7025ccf55e9d70e5fa3db5159cd975e061003837",
+   "6e5e9ac54df68747bb52090810869e50c74e70ea",
    "testharness"
   ],
   "css/css-grid/abspos/descendant-static-position-001-ref.html": [
@@ -575498,15 +576263,15 @@
    "support"
   ],
   "css/css-grid/abspos/grid-paint-positioned-children-001.html": [
-   "ae074da1af5d3a38a98e738e8590a341eb4e2ce3",
+   "549335e49fb781ae2dec98716fc633a2dbe3d746",
    "reftest"
   ],
   "css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html": [
-   "aa687de2f8c42aeb0a154b95a9e6c3b861a1991f",
+   "2794df263eba5417c66c6ae395ec5e364b4ddeb6",
    "support"
   ],
   "css/css-grid/abspos/grid-positioned-children-writing-modes-001.html": [
-   "d63b1894927bf12cec6b918b100d62ff8a7ed103",
+   "8b9df8bebada6b6b66ef5da68dc733d66934cf10",
    "reftest"
   ],
   "css/css-grid/abspos/grid-positioned-item-dynamic-change-001.html": [
@@ -575514,31 +576279,31 @@
    "reftest"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html": [
-   "81ea909d029937b67d06e39ab899930c9a623c2e",
+   "8d26215060245b1b9e0af6d535140b0f27849154",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html": [
-   "27fc722e6c31555e1e3a44ad88ce0e408c86f997",
+   "c44474962fcf3aade1a6c1ec3025ee831852e340",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html": [
-   "1c893392a4be57a2b627f8950ce32cd006a2523f",
+   "cdfb84c0bf564d20b8a9d1d8d213e8ca9e9b7639",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html": [
-   "54b2ff79027f93506684b06873387955c7c6ef3a",
+   "56e81c2cd2d4b09916de706f66144ab41278ecb2",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html": [
-   "56f870f4ec088a2aa23e9f3513dc5447b8ffd897",
+   "c0dd12174185f87ba8b8d6547235ce187978230a",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html": [
-   "e301d34937679ac48444faef74f142a654f743a5",
+   "3cd46f475bef9785d2f09e2f254c15d6230e0cb4",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html": [
-   "8c4621627fd7e4c91d52ca3b1387a71c1dd0f70e",
+   "32de532c38d2308e74c59acef07e88cd4ab7024a",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-background-001-ref.html": [
@@ -575546,7 +576311,7 @@
    "support"
   ],
   "css/css-grid/abspos/grid-positioned-items-background-001.html": [
-   "54146bce2581db8749ea75622edfdcd148d266bb",
+   "f5e49fbffe574e9e16cfd12dedb643b02c5f28dd",
    "reftest"
   ],
   "css/css-grid/abspos/grid-positioned-items-background-rtl-001-ref.html": [
@@ -575554,55 +576319,55 @@
    "support"
   ],
   "css/css-grid/abspos/grid-positioned-items-background-rtl-001.html": [
-   "97ec1052f4be3ce0b26491c60d3c02184328dd12",
+   "81f4f10f5c5cf97eea5d89352206cf8cbce7595a",
    "reftest"
   ],
   "css/css-grid/abspos/grid-positioned-items-content-alignment-001.html": [
-   "ebff62aae9ad526ebb96d93a97ca9075600c252c",
+   "0dfc2ad65bc177c2f7ac515105e3d602c8d3a5da",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html": [
-   "628a63c7e793de59d0bb023b6a5080dface6b5c0",
+   "30879181cb9ab982f2ac710f545ebf3ab70b639f",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-gaps-001.html": [
-   "b9f3343ea92097dead746b7514cd0f87fa1cfaf3",
+   "7fb11200d1b2e4a35f37d0e3f009f9dfee7bfd8a",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-gaps-002-rtl.html": [
-   "4ea6cd657235253ced4ea88b832d0c372b844ca6",
+   "9e1352b0de051d92da9d3169b292be2848f43644",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-gaps-002.html": [
-   "22b1b4b44bfba8ac9633f2d71f60596833e2fd5b",
+   "46e8801bb67d58b662f83aff65a7ad5479293d49",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html": [
-   "16ab39df9fb187daeb8071293e1372bb57f7c697",
+   "8559ea583bbb874569f1f93f25ec25f928d894ee",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html": [
-   "4b1a3d0f342f84b3a901513ce99bfcc96b635511",
+   "8e576bf4b7a86763beb0bad55854f8efb2ac4759",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html": [
-   "8fc8918ee68b215da3e93fb73282ab8e0b2ef287",
+   "e2b2bdb2003db0537d15c447237699a4c44beddf",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-padding-001.html": [
-   "643a68830d4aecdad182f40d8b74fb8470da8b54",
+   "bfadcac7ac6dc6b15761d0b01beb96c3218d5c50",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html": [
-   "663dab45b3dbe76075c6a32a3e7b0b6a59213181",
+   "8dcb91ed6c8f35ca27198e64800010324e3a9767",
    "testharness"
   ],
   "css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html": [
-   "5a31c35f2088566be5315de1fe4c0e7d789b86e9",
+   "18d2ebff015abf76acbbd726dc3b8c22efc56b8a",
    "testharness"
   ],
   "css/css-grid/abspos/grid-sizing-positioned-items-001.html": [
-   "e74b2b96fe62e102f4313c00bcc730bec76a667a",
+   "b3716888c33ac864931283797be8f7b6b08d425a",
    "testharness"
   ],
   "css/css-grid/abspos/orthogonal-positioned-grid-descendants-001.html": [
@@ -575974,25 +576739,21 @@
    "reftest"
   ],
   "css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html": [
-   "adb4a7acf27514550682429e998feadb2af5676d",
+   "82309e676b8c22c9039994acbd28d3088cfc2d79",
    "testharness"
   ],
   "css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html": [
-   "50f9984370baa88d2940b5457b54067a9497a812",
+   "7ea528b00f1204f2d0e78a4ea0ff386090d14928",
    "testharness"
   ],
   "css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html": [
-   "ac5494ee30b96998331018e98fe4c4f0ca47288f",
+   "cd0e378e3bf0e1d78ba9e3d1ba3035ea6d1d5458",
    "support"
   ],
   "css/css-grid/abspos/positioned-grid-items-sizing-001.html": [
-   "2f0056f4eeedce15cc1266cc88d4dc20f57d943a",
+   "7fb303c0dd0df39d614f8bee8bd003494fcd233c",
    "reftest"
   ],
-  "css/css-grid/abspos/support/grid.css": [
-   "78fdd5e975ad61d3a8c39fe4e05694a278753c37",
-   "support"
-  ],
   "css/css-grid/abspos/support/positioned-grid-descendants.css": [
    "9fa29a25ae35b9b8a29d0c14032e457d513dea3a",
    "support"
@@ -576209,6 +576970,10 @@
    "c7e65dcc2fb56db1acf0290d326a4db072594a4d",
    "testharness"
   ],
+  "css/css-grid/alignment/grid-baseline-align-cycles-001.html": [
+   "cc6b3b50f984a97838f05e340c51f33f335e0f97",
+   "reftest"
+  ],
   "css/css-grid/alignment/grid-block-axis-alignment-auto-margins-001.html": [
    "a1cc22a41d3f89045eae41e80adb39387464be66",
    "testharness"
@@ -576318,19 +577083,19 @@
    "testharness"
   ],
   "css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-001.html": [
-   "673cda037dcd23660cea41a36bc097ca7da6a56f",
+   "e7bafab2e967599dd44245229e767d5a6d20048e",
    "testharness"
   ],
   "css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-002.html": [
-   "33e99ff65802be4d1ba3d17e65d13d96271b8839",
+   "769ce1ea48b638bdc382241b9f72dcffa138ec39",
    "testharness"
   ],
   "css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-003.html": [
-   "101363a45cd03401c9decf7994c373e0d7d5fc27",
+   "a68868e0385f0b46731809d0b886ffcc081f3f1c",
    "testharness"
   ],
   "css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-004.html": [
-   "da4d4f4fbcaf3b3c82e702bd3219ce3c97e0bc2b",
+   "f69fac5cef79256996e9ed949e4298e244272be0",
    "testharness"
   ],
   "css/css-grid/alignment/grid-container-baseline-001.html": [
@@ -576338,11 +577103,11 @@
    "testharness"
   ],
   "css/css-grid/alignment/grid-content-alignment-second-pass-001.html": [
-   "acbc473a38450ca24a14a9ffb7ebf38b098914dc",
+   "5f8c8e23c7c27951675d0c7a88574e566427d028",
    "testharness"
   ],
   "css/css-grid/alignment/grid-content-alignment-second-pass-002.html": [
-   "d06083188cedb74a8904a549328d70a73131b8ad",
+   "c3f32c7efc7def5b6a560a40beb21e73b16ad50a",
    "testharness"
   ],
   "css/css-grid/alignment/grid-content-distribution-001.html": [
@@ -576706,19 +577471,19 @@
    "testharness"
   ],
   "css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html": [
-   "55a787546ba7d078ad514daddd18386af13194d3",
+   "dff798cf5e01592b263b5876a37d4688b16b9e94",
    "testharness"
   ],
   "css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html": [
-   "ccfac854971cf140f60138b5821ca2e7f31f049d",
+   "27e89c119dd2dea0367d1001d98da242c93d6243",
    "testharness"
   ],
   "css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html": [
-   "76bcab2a9d46012648a1c77ffeca8dfe06f4150c",
+   "3530084e88e723c0c19e439761b8aab4602b02c8",
    "testharness"
   ],
   "css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html": [
-   "1ee19e439d839ced4021725c2a27655eac001fff",
+   "4e49df7796767c71b4f4a51b0197dabf55324371",
    "testharness"
   ],
   "css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001-ref.html": [
@@ -577054,17 +577819,21 @@
    "testharness"
   ],
   "css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html": [
-   "5b6f6ef31cdde520c405152e45af76637b3becb2",
+   "49d0a393508b86f5020c7bd3f0f625b006b2c42a",
    "testharness"
   ],
   "css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html": [
-   "16edc3cad05f0b0e46beaa6fc42be3c9dd083222",
+   "8517771d9089d593ef7d67e92a558b7b5ec15e47",
    "testharness"
   ],
   "css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html": [
-   "da861d017e93a20840098f2803832a6b8bf04c47",
+   "9122b5cbe9483992bd6dc1dba69955e76a75e538",
    "testharness"
   ],
+  "css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html": [
+   "ca1097e171e8f4b18fd72c1e7614bff860b2cb36",
+   "support"
+  ],
   "css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html": [
    "5b2ecaaab06b1f86397818fe5522cbc1e0a2f55a",
    "reftest"
@@ -577166,23 +577935,23 @@
    "reftest"
   ],
   "css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html": [
-   "cb843624377b309c5a6288b6426cf107fe38ef7d",
+   "2786a986e062eee135dfb2ccded7e4c3d9ca8210",
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html": [
-   "0f8c860a282138d3785a512dd713c23ee37448dc",
+   "9fc0c983117a54ec550428b764a5b1afa15d81bb",
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html": [
-   "e9d1fded1ecc556aab0b96d7b82b6e793325951b",
+   "7ff8b2ca23977ac58d8e7ae0835261e589e86171",
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html": [
-   "08d5ff82f299ca4764a7119784e4dc1c14cdadb4",
+   "cb29eed1537dc7827adbff6e08fb5f9e72041094",
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html": [
-   "5fe4f33b51cac91a726e0e5632d58c15cb211a27",
+   "4c73da77730536c4e107978e2b52bfc5559659cf",
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-auto-repeat-multiple-values-001.html": [
@@ -577190,15 +577959,15 @@
    "reftest"
   ],
   "css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html": [
-   "33fcb248c26e00fe541d5081c9e34710c811788a",
+   "c2d17ec615f0f092e54c0c4792ca4a03bc1cfe8a",
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-change-fit-content-argument-001.html": [
-   "905ad60ac846e3c023a7f948e023f73e563f65ad",
+   "c46722bc7dbad096a3925e58d5d93fb5b7297b8d",
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-inline-auto-repeat-001.html": [
-   "b06ffe5e43a89e796b09466a6bb1041116cde583",
+   "deda5656679c29cd8706762deedcf56e11d4b95d",
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-inline-support-flexible-lengths-001.html": [
@@ -577238,7 +578007,7 @@
    "reftest"
   ],
   "css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-001.html": [
-   "383c804a07c801afd3f4eb6a9a08709b73698629",
+   "40c642e1f32ca3ea33d517859eb3309560e85bca",
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-002.html": [
@@ -577274,11 +578043,11 @@
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html": [
-   "36619d1430e2799081e7b544dd7eeedb419d36f7",
+   "f29a13e0fe060ae15835bacf8bc1bf3436c0b50f",
    "support"
   ],
   "css/css-grid/grid-definition/grid-template-columns-fit-content-001.html": [
-   "da31354e79536fc2adb6fa678f3af260baab9d6a",
+   "83b53db39b154dc8001dbef809aeb0eff7774c2a",
    "reftest"
   ],
   "css/css-grid/grid-definition/grid-template-columns-rows-resolved-values-001.html": [
@@ -577286,17 +578055,13 @@
    "testharness"
   ],
   "css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html": [
-   "23d74e9af978442ab422705997e1bca8c25ca3b7",
+   "bbadddc324f56c294679516b3152e8b7354aca26",
    "support"
   ],
   "css/css-grid/grid-definition/grid-template-rows-fit-content-001.html": [
-   "a083330cb34c839f6a90cd2b9c65b413deda3a6d",
+   "f28aacb23bbd12c96efc4c157789bfdeaf943feb",
    "reftest"
   ],
-  "css/css-grid/grid-definition/support/grid.css": [
-   "78fdd5e975ad61d3a8c39fe4e05694a278753c37",
-   "support"
-  ],
   "css/css-grid/grid-definition/support/testing-utils.js": [
    "217b620463624e2feb294b320e7787f6c91f1932",
    "support"
@@ -577498,187 +578263,187 @@
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-minimum-width-001.html": [
-   "00487f766a7b0dbd4a35e6910ce16f7cffd00eef",
+   "78bbfcbd2f64f0777a3656fec296e029975c1ebb",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-minimum-width-002.html": [
-   "c9f77a6ebe09568ce4166a978ddbfff1e1a37db7",
+   "8458e8e0780a3b5bf2d7a9919d217372eafb7f6b",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html": [
-   "943837d2031c5046038e8078ed3b937a04e477bb",
+   "33df23e6c0ab2048336e0171569773ba9c5c4ccc",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html": [
-   "25ad710d5d2f3c25e0f391edc8dddd49b4307e48",
+   "ef2223256797a0aeca987b79dc8ad91ea9977037",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html": [
-   "1afe6df9535079fb6deaf75e88eb2846490b6759",
+   "f137a7e475616c74a2605d19d594aa03b5c4f069",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html": [
-   "a239369e4d9e8adce8697174ab2a53301964cea7",
+   "9f2a5a2dae13d5af5b0f3add66a4707b05ca4679",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html": [
-   "df3fe9bca499fba68f0bc0914c4dad8cecca3451",
+   "54a5a9187b8c1fd34b02d7f207987fa7d3f32865",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html": [
-   "3978ed607b7f2d685188b9582f4381aa439da2b0",
+   "0640dbfaee579350c31d10e00ff975a9944158b7",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-001.html": [
-   "8ef91b3fb87fb65eb5ea753a8b788a82569edd33",
+   "62fc14f4a97cf648416f2b375a7e93d49de2fdcd",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-002.html": [
-   "e45530b2fd4a380ba62c3b42ba52157cec098a00",
+   "19c75d7463f55edb4e4177bf3fc402798d088dbb",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-003.html": [
-   "03d5d7f2c499b00cda96b8235a11852998900259",
+   "d6805b7b35b6aad0bbed3927a7097497fddf2e87",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-004.html": [
-   "52e6f3bf1a688af98bd28d68f8d7e0ddde3ebee5",
+   "009d655832b727c19b4be1f9f5dadbe02c36ba6f",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-005.html": [
-   "9cff92d1aa0ccdf2aa2dd0c89b4bd626778d1214",
+   "4b86153e1b51fb05126e9cbeaa205730723e663d",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-006.html": [
-   "04d30e3edfc9920fb22f645549b00497ba0241fb",
+   "290f3fd7814d0544e341d401a6ed6345cc274529",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-007.html": [
-   "2906fe0608704a1b8413fa7a24db140667254283",
+   "78958e01708f57e053cde598b6f7ba99164d7bad",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-008.html": [
-   "7bd2e0fc5f4f24b35ff37c61c0b20c1b2ab61571",
+   "49a42722c0594b292460061ab781758b20d8e746",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-009.html": [
-   "70a6c231dc91b1b2f866e9cd4463860ce9f58c4f",
+   "5fed639ef9c9b26aebdb7e7489a752a0c4c32452",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-010.html": [
-   "34352f60020ec44e4d5f27344818bdb476de694e",
+   "5d6995f6906e3180cbadefde1ec90242c8ec3c94",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-011.html": [
-   "36bd208df007332656acbb4b3ffb5aac86675c82",
+   "f2a87e1fb81c2b765bf6d6d62307b8045fa07af5",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-012.html": [
-   "9cdc15337a936724b8ce157638544f4f9e35b65c",
+   "1071cdce5f9a40c4a73c3713dd8b3ef53db23184",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-013.html": [
-   "581415b828e6d54056fe94e5145e276e7e428352",
+   "cb3b56725b84cf0864a92994a35c6c09c128cfe5",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-014.html": [
-   "5766e60339a0d83568c93a7f750976dbb9955e6a",
+   "32a171dc9efe787848b35e822a0efa3689018250",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-001.html": [
-   "aa0ff96985878c5f21d7e7a8175b1351e9841656",
+   "81e096531be4d79be10b9c71e700a002633e8455",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-002.html": [
-   "2f7724c04e438ee09d1be1ef83993c0fba4acf63",
+   "5d9584d28a84ac35ca99e19fca3dfea0aa2c49f6",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-001.html": [
-   "efac5c6aa280e1add620d876e338c1042288bdd1",
+   "f0b493868397e8fc53c511ba7e3832417cfc1787",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-002.html": [
-   "6da1d723a7531013fd53dede05b114e781e4dd2d",
+   "142b2fd2bb69f0963b17b871e30c73395402b685",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-001.html": [
-   "bf083d3ff7cc029a21fa3a758adb80cf1e2a95ce",
+   "892f8f90bcf37b489501b96f6b6363dddc40d6c0",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-002.html": [
-   "3175469fb08361398658ebcfabb553909aa9c080",
+   "798cdbdbefb9e8afaf0a23c81b311523bf8a9d27",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-003.html": [
-   "d85a6c1abcfac6c2ecf6bfc1251ba41b58fbab89",
+   "970f83c1edccc0a564dec28770a5c1a76317b3de",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-004.html": [
-   "26302daf2d606637930ea41971f3d6066f782a2b",
+   "60b08630df9846acd02ab42cec5ed4b18296e76d",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-005.html": [
-   "151b604f9bb7c7defdb5edf558ed207777cc0903",
+   "6c67080f7a9ae5c7f3691c48cd541f427445f7cf",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-006.html": [
-   "bcbc7ced73a77ebfb1e2aa027383f868bf38fe87",
+   "b17a5690241a4ec1f06c0d1512e2363aebbf4258",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-007.html": [
-   "d4cf80c18df05bf06406eccf8aefe7050ed4025f",
+   "a49956390dded6ec0cdcee1352ed33d10e5cb27e",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-008.html": [
-   "38f766b5cfffcca21906203c8c3472dd1230b197",
+   "da9328bebc28ff9f3440d3629d6ec507cdc9a3f0",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-009.html": [
-   "eb1d1f47f28c3daefd78e9e98881459f91c2046d",
+   "5d86919be298d8e024d890ab2de3938d9ea4fba6",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-010.html": [
-   "ecd430c68d41698b328341eb9d9e2daba2a7848c",
+   "18c8a9b7c81d45d17c5fc21a0c39494e7169568e",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-011.html": [
-   "e394ced4e6e52f3379428d3ad854bcab0b3cb38d",
+   "a6aaed5ddf0676a44fc1cbffbd13d7e8d6f8ebef",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-012.html": [
-   "07b2d27b58173a84851c4836c85281efa818c2e4",
+   "771a1c8fef11851812e73347193c1aeca31c79c1",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-013.html": [
-   "9b6c2bfe0ad261358ff7657752bd3bc3dff0896d",
+   "5e6ff096469e6d2ac1b1cb55eba83e21ddc3c47c",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-014.html": [
-   "9e67960913a25f0fe1cfe137ceca5d11ebf0b43f",
+   "2a9bd67ec4e9bfd7e183108b6fb96239b69fe79c",
    "reftest"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-001.html": [
-   "6ad624a0a262067eb6e3b0724989ab01ca04f6a1",
+   "74997fd8b121d86510aa688f21d9fbcd4ed44c17",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-002.html": [
-   "9a3f3f13ddc883d877cfc6528227b6af7490be61",
+   "edffee26fd023822166dce3484c84b96030fc507",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-001.html": [
-   "49459a7089484d4ea3edb9c21d8370c1ec5236aa",
+   "92f943874d8ae55faaa600bae5475a1e6d2cef9a",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-002.html": [
-   "3fa9766b2a7e304a0b592a5f4fe6bee4cfa26dd3",
+   "d3e062eaf8d54b46f51351ebd76a27db32e158ce",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-relative-offsets-001.html": [
-   "cb5e8ee23b66589a622c162c065ba8f5dd88a495",
+   "1c5c94cbc9820fdd5493da470ac4727fb1bef51b",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-relative-offsets-002.html": [
-   "d92fca3ebb06fc106f42da22dce9e46383fc13a5",
+   "86a8f1af761e4c6a38c3ca4235d89e58f73e7571",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-items-sizing-alignment-001-ref.html": [
@@ -577786,19 +578551,19 @@
    "testharness"
   ],
   "css/css-grid/grid-items/grid-minimum-size-grid-items-022.html": [
-   "577d2baed2840b2e29af1fd983ac6e2cf89a7518",
+   "350bce5947af8e68dc3bf6987e1515d284e7bd1c",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-minimum-size-grid-items-023.html": [
-   "972b6e7afed03b9dc7c8b64a3b439708c70b3b0a",
+   "0f91381bb30cff75ef9f0191975bf6480a04fe1b",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-minimum-size-grid-items-024.html": [
-   "e6acf16d35cb67be04f1e8f3165e8645a89a7058",
+   "74063286a644ddc3b4283dfbd2f4ed11e56cb240",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-minimum-size-grid-items-025.html": [
-   "3608eb50c7ad5355f595b135e3bdee6abed60281",
+   "7b8c956d17c4d0e668ce62e040be1e3bf8af5ff5",
    "testharness"
   ],
   "css/css-grid/grid-items/grid-order-property-auto-placement-001.html": [
@@ -577933,10 +578698,6 @@
    "f709bf09e5ae6bf48911b69691b0acb5c6f2760e",
    "support"
   ],
-  "css/css-grid/grid-items/support/grid.css": [
-   "78fdd5e975ad61d3a8c39fe4e05694a278753c37",
-   "support"
-  ],
   "css/css-grid/grid-items/table-with-infinite-max-intrinsic-width.html": [
    "877e982cd4c5987f131587da33a23f3b7a49d538",
    "reftest"
@@ -577954,35 +578715,35 @@
    "reftest"
   ],
   "css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html": [
-   "f1b8567f34ea197a02c837c9cec54e0afb51cd71",
+   "39807360568911d62b071d1a71395e724b03ddb4",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html": [
-   "dee656adcdcb899a1a22412e813dee3bc06e25d4",
+   "04f68feb1ad6091c89491ae97111c12c52a5b3c7",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html": [
-   "3d13eab22b8abb28284a13d7009e06ede20b0e14",
+   "1454bcbed34b6c63537c3ab319dad4d0904a411e",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-areas-overflowing-grid-container-004.html": [
-   "c4cd8b995dad9f956135b1a6a604d4bb6dc055a6",
+   "357bb5dd742f1659e2d6ce6f157067f304ff67c1",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-areas-overflowing-grid-container-005.html": [
-   "afbde569602009733696669a6bb97b39d6d3a18d",
+   "226544547a16b30267072ac50dcb9890bfe578a6",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-areas-overflowing-grid-container-006.html": [
-   "4c689acb6010de420d06f2e8eff4aeadedceea2e",
+   "6f1546f3fd0e6539c655f686ccd9236ab899b2ad",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-areas-overflowing-grid-container-007.html": [
-   "96faa81db3d5453fa6c5f8fc60ce1ff53f99d29e",
+   "0a7d3aa28a5a67faf9827257d86a7e97f3a8cfd9",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-areas-overflowing-grid-container-008.html": [
-   "baab7ca34fc9c783b9b21fd0154b76ee4e459e81",
+   "df39ed8262fd2e722bc872ba43e13e667361c65e",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-box-sizing-001.html": [
@@ -577998,7 +578759,7 @@
    "testharness"
   ],
   "css/css-grid/grid-model/grid-container-ignores-first-letter-001.html": [
-   "b8e344ef7776ed8c00571c758363030424ecba61",
+   "8e322fe38e1136a27c49264fb4e0dfac4ed6675d",
    "testharness"
   ],
   "css/css-grid/grid-model/grid-container-ignores-first-letter-002-ref.html": [
@@ -578010,7 +578771,7 @@
    "reftest"
   ],
   "css/css-grid/grid-model/grid-container-ignores-first-line-001.html": [
-   "140d7bf115115043a844ac83852efc842340d42c",
+   "b19eee76a9fb90ffea95e53759b07e6912855759",
    "testharness"
   ],
   "css/css-grid/grid-model/grid-container-scrollbar-001-ref.html": [
@@ -578018,7 +578779,7 @@
    "support"
   ],
   "css/css-grid/grid-model/grid-container-scrollbar-001.html": [
-   "80a8cd117e717308376e16de9b8b16f4e8ad2ccd",
+   "848ed7d9090b3a6bf5b328346ff9c528ecc208fb",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001-ref.html": [
@@ -578026,7 +578787,7 @@
    "support"
   ],
   "css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html": [
-   "cb1cfdc06a3bcc90a68024af2b264a56a113f869",
+   "aed5d0cf492a39d18a4e18024e32ba05ad87d092",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001-ref.html": [
@@ -578034,7 +578795,7 @@
    "support"
   ],
   "css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html": [
-   "03144ae0da7ef09e1807e307563428b93acc6640",
+   "e07223df2ae5bf003242211f9378d81ab554f684",
    "reftest"
   ],
   "css/css-grid/grid-model/grid-container-sizing-constraints-001.html": [
@@ -578126,11 +578887,11 @@
    "reftest"
   ],
   "css/css-grid/grid-model/grid-item-accepts-first-letter-001.html": [
-   "b6914eb536ea180469ffd54fc7e88add1b6eb517",
+   "32206794c345d864de2508e73a5336d91dff3837",
    "testharness"
   ],
   "css/css-grid/grid-model/grid-item-accepts-first-line-001.html": [
-   "8bf8c653bf7955decf6148fea5a4065d68fbbeab",
+   "a6c8d2df451fa2d95b565377841cace1f0078b4f",
    "testharness"
   ],
   "css/css-grid/grid-model/grid-margins-no-collapse-001.html": [
@@ -578165,10 +578926,6 @@
    "0592f6d2ce582c3c89b9d7f5278eed9458531c3c",
    "support"
   ],
-  "css/css-grid/grid-model/support/grid.css": [
-   "78fdd5e975ad61d3a8c39fe4e05694a278753c37",
-   "support"
-  ],
   "css/css-grid/implicit-grids/grid-support-grid-auto-columns-rows-001.html": [
    "e61ced340c610401448bdc0c636a835708fa80b9",
    "reftest"
@@ -580386,11 +581143,11 @@
    "support"
   ],
   "css/css-logical/animation-001.html": [
-   "8135f43275bb1d6b918fd410ec41823ea77961dd",
+   "71542022c97964090806691b5a175bff07029b61",
    "testharness"
   ],
   "css/css-logical/animation-002.html": [
-   "d4f199d50e48b3e239e395fd442da9d530652066",
+   "9213a05d83daa8ad37b95fe0fc832e1c04480ff6",
    "testharness"
   ],
   "css/css-logical/animation-003.tentative.html": [
@@ -580962,7 +581719,7 @@
    "reftest"
   ],
   "css/css-masking/clip-path-svg-content/clip-path-recursion-002.svg": [
-   "ae10c06afc40999843d0b694bb71555cd08f5b8f",
+   "7d921ee67d4417f8e510e2793c678bca4235adf7",
    "reftest"
   ],
   "css/css-masking/clip-path-svg-content/clip-path-shape-circle-001.svg": [
@@ -581157,6 +581914,10 @@
    "4c83c9def7e9f4b691f8bb089c4e2441d4731d47",
    "support"
   ],
+  "css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg": [
+   "6eb3cb155caf003333c3cff3c9ee2871bc6dbe64",
+   "support"
+  ],
   "css/css-masking/clip-path-svg-content/reference/clip-path-shape-inset-001-ref.svg": [
    "e458ad994a7bef2a14cb0957defe13a32259d96a",
    "support"
@@ -581385,6 +582146,14 @@
    "8d2c049a7e758e496eb2f823b808fd971468b795",
    "reftest"
   ],
+  "css/css-masking/clip-path/clip-path-svg-invalidate-ref.html": [
+   "20c8085b948f7ce9f3268b1f3cfb653673e335e9",
+   "support"
+  ],
+  "css/css-masking/clip-path/clip-path-svg-invalidate.html": [
+   "0bf921c7cf125c1e8a9e6842c62f294b13104790",
+   "reftest"
+  ],
   "css/css-masking/clip-path/interpolation.html": [
    "da3981feed6ed681ee4a7d88b7ecd167b9fd5c7b",
    "testharness"
@@ -584626,7 +585395,7 @@
    "reftest"
   ],
   "css/css-paint-api/hidpi/canvas-transform-ref.html": [
-   "48d46e8e56109a87d9bf2c637f016c7ad52c0a5f",
+   "d3e4e0913f6aa6f2e50c14e5a53f0978bcd33419",
    "support"
   ],
   "css/css-paint-api/hidpi/canvas-transform.https.html": [
@@ -589093,6 +589862,10 @@
    "2569cf3d8bfbf46f1d9217642afbf637ff4600ca",
    "testharness"
   ],
+  "css/css-scroll-snap/input/keyboard.html": [
+   "47eade8b809e3f8d4f4d7b0d72dbdd0239e2148f",
+   "testharness"
+  ],
   "css/css-scroll-snap/nested-scrollIntoView-snaps.html": [
    "b335de2c7f40dbcf07416c0a1283e20039ebb058",
    "testharness"
@@ -589290,7 +590063,11 @@
    "testharness"
   ],
   "css/css-scroll-snap/snap-area-capturing-remove-scroll-container.html": [
-   "0426c029eec2592eb8bf5cb9ccce22006d9665cb",
+   "9b8240715992c8c1f69dd8a154f58e47c6b88abf",
+   "testharness"
+  ],
+  "css/css-scroll-snap/snap-area-caputring-add-scroll-container.html": [
+   "d045367639200d99216e3cf498e24d56e1b2bf97",
    "testharness"
   ],
   "css/css-scroll-snap/snap-at-user-scroll-end-manual.html": [
@@ -589329,6 +590106,14 @@
    "80d2e9946de8827d9d53686f6c9b4abea2e27592",
    "testharness"
   ],
+  "css/css-scroll-snap/support/common.css": [
+   "f49c7cbacd5bd9084ab53fc2964e77ab52862e40",
+   "support"
+  ],
+  "css/css-scroll-snap/support/common.js": [
+   "65feec3b6b61c1342217ba550652f9dbfa684d6c",
+   "support"
+  ],
   "css/css-scroll-snap/support/scroll-target-align-001-iframe.html": [
    "d86a5e86d01b5806c55123f07254f71d8891dfc0",
    "support"
@@ -591409,6 +592194,10 @@
    "d2617f8aa2d1c966e394abb1d1617c012ea4648e",
    "testharness"
   ],
+  "css/css-sizing/ortho-writing-mode-001.html": [
+   "9342802645faa7b57a12ce4b8ef17d755fcaface",
+   "reftest"
+  ],
   "css/css-sizing/orthogonal-writing-mode-float-in-inline.html": [
    "fa95069dbf0083b0dc7095d2bb3acf20a6ccf898",
    "reftest"
@@ -591501,6 +592290,14 @@
    "11c34eafc32812da1b4da1552afe08c231cd69db",
    "testharness"
   ],
+  "css/css-sizing/percentage-resolution-001-ref.html": [
+   "a4e7f1ece4675bd415ed29ed0801b4890a31c9c4",
+   "support"
+  ],
+  "css/css-sizing/percentage-resolution-001.html": [
+   "b2cc727ca7a94f4c4f27a3d4c515f8665b769f34",
+   "reftest"
+  ],
   "css/css-sizing/range-percent-intrinsic-size-1-ref.html": [
    "9a68590b6389eb9c1fefc2dc37f42b2a60b3b41a",
    "support"
@@ -600886,11 +601683,11 @@
    "testharness"
   ],
   "css/css-transforms/animation/rotate-interpolation.html": [
-   "1ce74f76d25d18a99561357c3ecea9d8262c7e4d",
+   "eff60ba72f72c126ce442a02e89a6b1875190297",
    "testharness"
   ],
   "css/css-transforms/animation/scale-interpolation.html": [
-   "29999d49ccf85b0e5d55cfa263754d90c8300675",
+   "0e33371955bb7ea630939de5c0333355f9830586",
    "testharness"
   ],
   "css/css-transforms/animation/transform-interpolation-001.html": [
@@ -600922,7 +601719,7 @@
    "testharness"
   ],
   "css/css-transforms/animation/translate-interpolation.html": [
-   "1764df3e967088312af38d03e466adfaf2fa91fe",
+   "67d9b136211670a4fe664e880feff802c95d897b",
    "testharness"
   ],
   "css/css-transforms/backface-visibility-hidden-001.html": [
@@ -605245,6 +606042,14 @@
    "c007816ecb04236421ff0aea8861da19c244338a",
    "testharness"
   ],
+  "css/css-transitions/animations/vertical-align-interpolation.html": [
+   "c81c83239354cc3c179612f26f95891dac8e3676",
+   "testharness"
+  ],
+  "css/css-transitions/animations/z-index-interpolation.html": [
+   "9673cc4d8cbb80cf624128e198b6e8bf1b2a1bf1",
+   "testharness"
+  ],
   "css/css-transitions/before-load-001.html": [
    "009260eea430721971053f6d98330f9a9ed56d6d",
    "testharness"
@@ -610434,7 +611239,7 @@
    "testharness"
   ],
   "css/css-values/minmax-length-percent-serialize.html": [
-   "f0ffd4ea2ce2e3ae3246793cc3191ccb290d0697",
+   "c353fa849076f4551827a10b9742a85b53d4fc18",
    "testharness"
   ],
   "css/css-values/minmax-length-serialize.html": [
@@ -618589,6 +619394,10 @@
    "cc67ce76ed9d432656b37c9c81a20e86d1bafc8d",
    "testharness"
   ],
+  "css/cssom-view/scrollIntoView-horizontal-partially-visible.html": [
+   "1e8bc50071f080a89b9e19bbad9f6c4fbda1cc29",
+   "testharness"
+  ],
   "css/cssom-view/scrollIntoView-horizontal-tb-writing-mode-and-rtl-direction.html": [
    "3ef9d62a3654c5ab2dd061e34799053daeefc3a4",
    "testharness"
@@ -623422,7 +624231,7 @@
    "support"
   ],
   "css/support/grid.css": [
-   "78fdd5e975ad61d3a8c39fe4e05694a278753c37",
+   "5cfb15e7ef0dcd9c4bb1f6d1d9fc04e703ac126e",
    "support"
   ],
   "css/support/import-green.css": [
@@ -623438,7 +624247,7 @@
    "support"
   ],
   "css/support/interpolation-testcommon.js": [
-   "9e63b02cb703d44e909c0c525f3bd56708477dda",
+   "3c9754c694128010aee095422cea127f10b6f355",
    "support"
   ],
   "css/support/parsing-testcommon.js": [
@@ -633698,7 +634507,7 @@
    "support"
   ],
   "docs/writing-tests/testharness-api.md": [
-   "1bdf06613f993bd7ad74a8385c682150f4ea121c",
+   "a17f5795bc33d64570dac59524111675b44a2880",
    "support"
   ],
   "docs/writing-tests/testharness-tutorial.md": [
@@ -640982,107 +641791,107 @@
    "support"
   ],
   "fetch/metadata/appcache.tentative.https.sub.html": [
-   "3aa902cc1462c08cedc4f8efbd0ae2d86c6961bd",
+   "8912548ab1c96f99df1af712bbccf79bfbf2968d",
    "testharness"
   ],
   "fetch/metadata/embed.tentative.https.sub.html": [
-   "77042e85de9f26655fc31085074e2401a8202efc",
+   "8a59b821b45544848279035921df041b9d63c033",
    "testharness"
   ],
   "fetch/metadata/fetch-preflight.tentative.https.sub.html": [
-   "1ab3de615c8a620c01378577acd8e032998fb980",
+   "ec987e1ca4b8b232e45d8e649b3b1b7ad631d1a0",
    "testharness"
   ],
   "fetch/metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html": [
-   "13016fe35374949ddc27c42b1b57a74190675c7e",
+   "9f494461372d3aeb5a70d29c860903689a26f5fb",
    "testharness"
   ],
   "fetch/metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html": [
-   "d43715785b4a6c323bae1f96a064b97914c0db3f",
+   "03d5fd1cc31b6ffc09f66429def21aeeae8d3742",
    "testharness"
   ],
   "fetch/metadata/fetch.tentative.https.sub.html": [
-   "72fb52ecd5d8123d5e387fdb20c171a320e38caf",
+   "bb7d20009442ac02c5e8011d28b67cc0014339c5",
    "testharness"
   ],
   "fetch/metadata/fetch.tentative.sub.html": [
-   "a14c2c5f411c803b28d7a12f314eba466c838437",
+   "1659a9fb6bf274fc8a5f15534a660f9f6c778581",
    "testharness"
   ],
   "fetch/metadata/font.tentative.https.sub.html": [
-   "9064dd6897393b184634a1abcef2f92fed7f9a71",
+   "2c705085d6a30cb0f6ba77ec3f1e05735d7a4772",
    "testharness"
   ],
   "fetch/metadata/history.tentative.https.sub.html": [
-   "0d78ec06035fa11e6cd9b6f50381079b2001a564",
+   "0a10f32beaf58f222d046d12fe452a5c4f1135c7",
    "testharness"
   ],
   "fetch/metadata/iframe.tentative.https.sub.html": [
-   "60ccbba721ba3d11f78c9cf84d7e22fe02724d3f",
+   "1c793fd7e459901f10e7ae93c6b3439eb9bd8246",
    "testharness"
   ],
   "fetch/metadata/iframe.tentative.sub.html": [
-   "be57362e9f0505b36d1faf58cb91af1b237a94e4",
+   "e0d5b0b8cb824ed32cc19166f6c1b83c9f0aadf2",
    "testharness"
   ],
   "fetch/metadata/img.tentative.https.sub.html": [
-   "ced6f9845e8af9e6a312d85e9c3f6efa209b8cbb",
+   "93acffef11ae23cf72088f9962da24e27911d11f",
    "testharness"
   ],
   "fetch/metadata/navigation.https.sub.html": [
-   "1c2ce9537959c184d864e76010b0d5882932c2a4",
+   "32c9cf77f90ee9c0710da5f623e8b175aaae7f3d",
    "testharness"
   ],
   "fetch/metadata/object.tentative.https.sub.html": [
-   "cf1c26039995336e413c432c35589322cbcbc43f",
+   "fae5b37b592d93f8f00d347b8a6f714371b2901a",
    "testharness"
   ],
   "fetch/metadata/portal.tentative.https.sub.html": [
-   "f9e370c67fbcbea20fc4fac2957fd50608fca13c",
+   "b9128944733b0301606a57087cb40c143d3cb99a",
    "testharness"
   ],
   "fetch/metadata/prefetch.tentative.https.sub.html": [
-   "30966f872f85bf0596011b4be2cb192ce7f55d15",
+   "a0ff73c0d0868e30b96d37264dec208865f5a6e6",
    "testharness"
   ],
   "fetch/metadata/preload.tentative.https.sub.html": [
-   "e8c541ef7f955d72ac95bca171c401c2501f0e5c",
+   "6da69be76150a4506909f9301be0ca31c57a4165",
    "testharness"
   ],
   "fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html": [
-   "0874273ef94f91eda96b8244ea6c11c9809467eb",
+   "827eb982e47f3fc2f8d7ccd3e7aa2e3c23fe64ee",
    "testharness"
   ],
   "fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html": [
-   "efff1cdaae8415f54d51b2c54a7cb3f12e6b702e",
+   "fc986aaf4fdcff900980824dc41f7ff3dacd4e70",
    "testharness"
   ],
   "fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html": [
-   "e7774f6ba10585a1897e11df10ee25fcaae473c6",
+   "37b2415168068d33f38e44c9930ede3608d202d6",
    "testharness"
   ],
   "fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html": [
-   "b1df738354cc31b9c553b38a0d02f4edaac88462",
+   "f5483ac3fa2f3f838525a4fcb26605ddb7e0c2b2",
    "testharness"
   ],
   "fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html": [
-   "c7e1721af78bbf6b3c258df7c7e8f28369c67e27",
+   "c47190651e5c929741060add0f0b40dab1e4461c",
    "testharness"
   ],
   "fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html": [
-   "760ed3a2998f70ce51da2cadc3ba5c997d639370",
+   "9eb04822b683bfb28f83e0ad3a78713a14c4b897",
    "testharness"
   ],
   "fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html": [
-   "a31d2d399f2ca7f9c3e167276287baf34e5b9202",
+   "38921a71314a54f070b24acc05c7a676f6a4b308",
    "testharness"
   ],
   "fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html": [
-   "f342b1c2669ecc17a68cd2699e786c9ee008af28",
+   "f8709a14c0f0ff391b1b771ec654d7c84b115ec9",
    "testharness"
   ],
   "fetch/metadata/report.tentative.https.sub.html": [
-   "821c56f5877a7a478047ae8711bb8b4f856d54cd",
+   "b0131fee97d8c37b4fc0f230b1cdada6b160980b",
    "testharness"
   ],
   "fetch/metadata/report.tentative.https.sub.html.sub.headers": [
@@ -641122,7 +641931,7 @@
    "support"
   ],
   "fetch/metadata/resources/helper.js": [
-   "d9b00ed8b94b595a4d4c1a50396355d3518c6496",
+   "a344c94106a11cb66d7c8cc00d5588e9d5879f38",
    "support"
   ],
   "fetch/metadata/resources/post-to-owner.py": [
@@ -641134,7 +641943,7 @@
    "support"
   ],
   "fetch/metadata/resources/redirectTestHelper.sub.js": [
-   "2764c07030c1ffbfd976137bc6450a61bfaaebf6",
+   "c40b5a5e17efda570570cb4b030fff3eebb13b99",
    "support"
   ],
   "fetch/metadata/resources/sharedWorker.js": [
@@ -641146,211 +641955,51 @@
    "support"
   ],
   "fetch/metadata/resources/xslt-test.sub.xml": [
-   "6a05633c9e4d1a7aa534597bd7ad14a422f7e5fb",
+   "acb478ab6414b56c59735ff84731783e2ff4aa15",
    "support"
   ],
   "fetch/metadata/script.tentative.https.sub.html": [
-   "d5a1096e8198c30e8547e8d6dbcbf71822aad3ed",
+   "f66f663433443ebf9e645e82bdc67bd4f243905f",
    "testharness"
   ],
   "fetch/metadata/script.tentative.sub.html": [
-   "b1361516cb5371bfe5562a09a32bac680ec2af0d",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html": [
-   "469001e2f3380a61f59ffc9cebc123e8912b0f36",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html": [
-   "d880deee5dd9560d180357d0631846ae92076447",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html": [
-   "63d53e8969dad3d564eedc29675d1fdbd4430eda",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html": [
-   "d2341572eb7940fd046e3f895dc251ee27074a5d",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html": [
-   "f70ae8b9dd3a55c5dac0d83d01332cd6eba4fea4",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html": [
-   "99f8191d7cb928ff5f552e3a4f65e50064bd13b8",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html": [
-   "cf6c7977af221f2e5d2abd9f717e55988dc0294a",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html": [
-   "bc892db320c29b2979060b4ed29aaf5f507798d8",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html": [
-   "d80b727469851c131df6226f20fff03377b4a9c6",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/frame.tentative.sub.html": [
-   "61b6d1f446beb918cbaff18d4cbecbab7143aa32",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html": [
-   "55e03a23660bc13d98763ffbe0ba8b077914cbcd",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html": [
-   "356805d190024230dc691b584c03cb4e6f16951c",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html": [
-   "e126e3c0a89147a5d878992f211b19be08e7089c",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html": [
-   "f6b84b1795b40b9a9a8e0cab84456ee12d5547ea",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/navigation.https.sub.html": [
-   "3ab843d165c0510192bca51a36f701ac583ea1bd",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html": [
-   "29db51117858415f4a751892c758c88e9a72bc3e",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/portal.tentative.https.sub.html": [
-   "ad9e8fd936236ef2d8ba07cb0ad73dadd2e74ce3",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html": [
-   "be495ba332ec50e6d2d499b25331154a27dde1a2",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html": [
-   "2c82abb366403bd055ad3d95754b3d9df76d06dc",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html": [
-   "ea13cc83bdfdb65d2af15f458accc18e20e2b1ec",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html": [
-   "e74ce0c06d5b30765a696ea5c57be6f78ff68989",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html": [
-   "78ee10dc736cac4ae648254df21afac781ca7526",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html": [
-   "90a476684398cad2cf0ce14c29c2dcfcc08ff7c3",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html": [
-   "a31efcbf26acd986aab126d990b2eb07f9e0da37",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html": [
-   "425753cb5080fab47942a006914d14b9f15cc534",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html": [
-   "9b8b44b0ef28882f80a7b6289eb4fe7e6b4b5451",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html": [
-   "2f12fe03cab3bee32e9d65be24bbe5784411982b",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html": [
-   "d3cb7e101a56c95a2fad3519fc7f6b45789bcd91",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.sub.headers": [
-   "1ec5df78f30183b07f2739f180354d87e4572c5b",
-   "support"
-  ],
-  "fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html": [
-   "18e8be78848ffc2d821c38545f75d5a5fd23b0e1",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/script.tentative.sub.html": [
-   "0512dc676aae721fcbd339540cc9f04f681da2c4",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html": [
-   "1faee65bf076d15155e6f678064a851f18b949c9",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html": [
-   "882572c86fec7c1b6fcd3b4abbee870fbcb866d7",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html": [
-   "ed30c81c7dd23469510ed9a47cd4fef497b976bb",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html": [
-   "09e927f1a7c10ab1214c3f4591baeb3944b81e82",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html": [
-   "283b928e921917f6d6e54150f992713b29ed4135",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/unload.tentative.https.sub.html": [
-   "a702fb83d597e7662452d5afc8bcdbf3455502f6",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/window-open.tentative.https.sub.html": [
-   "650ba6afa16c0b4cd230fbc85dfc4adb63001ede",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html": [
-   "8e40fb621e24ae1fc60dc512fd8b6455e92bffdb",
-   "testharness"
-  ],
-  "fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html": [
-   "df44514fa1f346b5bc46eb73c18495f84c68e8f1",
+   "9d6059abc177eb6d8e66ccfdc567c699a207034c",
    "testharness"
   ],
   "fetch/metadata/serviceworker.tentative.https.sub.html": [
-   "1fbdee4f091bc46007a627bc80e07c50a1be708f",
+   "51bc7f29e593081bb2f1c959f36a78562a3bd833",
    "testharness"
   ],
   "fetch/metadata/sharedworker.tentative.https.sub.html": [
-   "0408c44201fa5125281671e71281d82b0925939f",
+   "4df858208a7457605d31d43b481dda599b89d1c8",
    "testharness"
   ],
   "fetch/metadata/style.tentative.https.sub.html": [
-   "08ac184b42109259a5d4977ab1bf0f4865c988b7",
+   "a30d81d70ddbae0da1f7200425596f0eaa30521b",
    "testharness"
   ],
   "fetch/metadata/track.tentative.https.sub.html": [
-   "11e45e23efd00dc5f8c79af8a2f43747628c9050",
+   "346798fdc0e5ae0a94515786e2b8e7e7578a3cfb",
    "testharness"
   ],
   "fetch/metadata/trailing-dot.tentative.https.sub.html": [
-   "f7069e7225586ca2de7b3a2c849142e0b4e6a498",
+   "afd876f0524dd40a0f77b743409e8968a89f81dc",
    "testharness"
   ],
   "fetch/metadata/unload.tentative.https.sub.html": [
-   "8917c53a3b3814162366df110fc20aaf38428d3b",
+   "bc26048c810725515e538496482bd167b50a4ee2",
    "testharness"
   ],
   "fetch/metadata/window-open.tentative.https.sub.html": [
-   "29c325f1213e7ca943da8144b0b9badc1e7fb11c",
+   "94ba76a19ff28d369c347d44a8713a336f7df8a4",
    "testharness"
   ],
   "fetch/metadata/worker.tentative.https.sub.html": [
-   "d2162d5bc7aba1674a75a2f9bc19fccf0aa4eb81",
+   "20a4fe54166056ddd4e515b991fe54cc09a6254f",
    "testharness"
   ],
   "fetch/metadata/xslt.tentative.https.sub.html": [
-   "5fc647b3ae7da7a2d0d65a8a6808deb642165084",
+   "dc72d7b8a6788387f3a3272593cf962ee415ef21",
    "testharness"
   ],
   "fetch/nosniff/image.html": [
@@ -647214,7 +647863,7 @@
    "testharness"
   ],
   "html/dom/usvstring-reflection.https.html": [
-   "b9cafd1fb352cf619141420cbb68aca1483ca8e4",
+   "162d58c50c449da07912fbce7ffa9ad9b7674d0a",
    "testharness"
   ],
   "html/editing/activation/click-manual.html": [
@@ -653237,6 +653886,14 @@
    "a809cc44b19796e50b7564b852a3234cca7e51f0",
    "testharness"
   ],
+  "html/semantics/document-metadata/the-link-element/link-multiple-error-events.html": [
+   "9d112e88d135c02c2cd539c26154095fe2cd9b33",
+   "testharness"
+  ],
+  "html/semantics/document-metadata/the-link-element/link-multiple-load-events.html": [
+   "b5550bb382c72dfc5113c5039f876498099efcb3",
+   "testharness"
+  ],
   "html/semantics/document-metadata/the-link-element/link-rel-attribute.html": [
    "14d06227ac862be169c2c1745fd6ec8913836394",
    "testharness"
@@ -662906,7 +663563,11 @@
    "testharness"
   ],
   "html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html": [
-   "006827f186eb4e47d387a3b0c9fae404e41e1d37",
+   "dcf10077331e6c4e64d4037525a6d6c0d12af1f7",
+   "testharness"
+  ],
+  "html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html": [
+   "685f5d19d7cae0cae1fd7b199dc8f3c9e9bbb636",
    "testharness"
   ],
   "html/webappapis/the-windoworworkerglobalscope-mixin/README.md": [
@@ -663485,6 +664146,10 @@
    "6f2f18a02e12a92530b7a3ae6bbbd31eecff3816",
    "testharness"
   ],
+  "import-maps/core/not-as-classic-script.html": [
+   "5f97394e4408bc8db5624e5d0c6f1b2fa1b028dd",
+   "testharness"
+  ],
   "import-maps/core/static-import.py": [
    "8d0f5d9f4204384ec9612ddca3ec30cec017d14e",
    "support"
@@ -663598,7 +664263,7 @@
    "testharness"
   ],
   "inert/inert-in-shadow-dom.tentative.html": [
-   "36c962b1fc7d50cb6cb46e7d79d9435323e64ad9",
+   "ec825dbfdc985458cc7393d58b2efc2ce0796364",
    "testharness"
   ],
   "inert/inert-inlines.tentative.html": [
@@ -663621,6 +664286,10 @@
    "7d5e90821bb0bd0d83711685853c78ff9fee6c4f",
    "testharness"
   ],
+  "inert/inert-on-slots.tentative.html": [
+   "dd0d7ec6d46d1ef34417dcf099ce5156bb149bea",
+   "testharness"
+  ],
   "inert/inert-retargeting-iframe.tentative.html": [
    "ddcb3ccb0d2c851fe3f1d07169de839465d12354",
    "testharness"
@@ -663926,7 +664595,11 @@
    "support"
   ],
   "infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini": [
-   "c7b3482c786fc4532488f388b802930ccea8dc0e",
+   "4a4f5946fad72286df130d96bb701f9744841249",
+   "support"
+  ],
+  "infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini": [
+   "4f1939a431ae272024f62a4169bf8431efc2c5bb",
    "support"
   ],
   "infrastructure/metadata/infrastructure/testdriver/actions/pause.html.ini": [
@@ -664161,6 +664834,10 @@
    "c8169733306b4f348509145f2f04df2573cc6c3e",
    "testharness"
   ],
+  "infrastructure/testdriver/actions/multiTouchPointsWithPause.html": [
+   "645caf2c720ee6af08a37d4c7e1e1d68c565fd55",
+   "testharness"
+  ],
   "infrastructure/testdriver/actions/pause.html": [
    "72f34c1bde8cf54814cdf91b3fdeeaff90dd07e3",
    "testharness"
@@ -664262,7 +664939,7 @@
    "support"
   ],
   "interfaces/DOM-Parsing.idl": [
-   "7c93a52d2a7a23bd787c3e4f121fa6a299d5afff",
+   "bcdbaa64623b8b887e92a6be6e555c3eca88a79a",
    "support"
   ],
   "interfaces/FileAPI.idl": [
@@ -664314,7 +664991,7 @@
    "support"
   ],
   "interfaces/audio-output.idl": [
-   "2a86188565fd3412ce2f6518b05f913309a90a47",
+   "cf0f46d08bc3dafae5f62cc505b3b3791ad3f7da",
    "support"
   ],
   "interfaces/background-fetch.idl": [
@@ -664322,7 +664999,7 @@
    "support"
   ],
   "interfaces/battery-status.idl": [
-   "1dcaabb0bad226efb962fae5cdabebf728980afa",
+   "3f7a58b38be58135aca9791f1eb6422f22fbc1aa",
    "support"
   ],
   "interfaces/beacon.idl": [
@@ -664498,7 +665175,7 @@
    "support"
   ],
   "interfaces/hr-time.idl": [
-   "0e30c3f150f9d66d0933dc80f62fe6eec4e5fd06",
+   "8179c66f44de27acf4d099ec2a213f7623cbcd6b",
    "support"
   ],
   "interfaces/html-media-capture.idl": [
@@ -664506,7 +665183,7 @@
    "support"
   ],
   "interfaces/html.idl": [
-   "486875ec274f84ca5a6dae5c341b76119cc2e540",
+   "266574de63e8f2aac4a782ba836a277bb5a2997d",
    "support"
   ],
   "interfaces/image-capture.idl": [
@@ -664550,7 +665227,7 @@
    "support"
   ],
   "interfaces/media-playback-quality.idl": [
-   "5a93de9f06c654c5e4f2a015674ae93dd21cbfc4",
+   "71c835677a76f454dec5ddaa146d41f0c045c186",
    "support"
   ],
   "interfaces/media-source.idl": [
@@ -664558,11 +665235,11 @@
    "support"
   ],
   "interfaces/mediacapture-depth.idl": [
-   "907940aed7deb9019b91ed1bac98f0e8f4693c85",
+   "4d7459bf207134151b4169355f31802f2665dd42",
    "support"
   ],
   "interfaces/mediacapture-fromelement.idl": [
-   "fad2f8356dfe7b9bd554a549b8c63b387d012e62",
+   "7e11909509578ddc072319b455d0a5bc199ebbce",
    "support"
   ],
   "interfaces/mediacapture-streams.idl": [
@@ -664582,7 +665259,7 @@
    "support"
   ],
   "interfaces/navigation-timing.idl": [
-   "7e76a35661734881d4c11432e15668223c788dee",
+   "57cea306d9e3b50b269587444ecf4c5190e15de4",
    "support"
   ],
   "interfaces/netinfo.idl": [
@@ -664610,7 +665287,7 @@
    "support"
   ],
   "interfaces/payment-handler.idl": [
-   "aadaecc17346e8651c487b9e94e7cd0bf29bee64",
+   "824210a5c1835923f719c434629a5124a3dd8e10",
    "support"
   ],
   "interfaces/payment-method-basic-card.idl": [
@@ -664622,7 +665299,7 @@
    "support"
   ],
   "interfaces/performance-timeline.idl": [
-   "3ce538c846c6285d791a8dde2ad1afba53110481",
+   "d3783858578c881b352e571deeb8cc4c9f0e6454",
    "support"
   ],
   "interfaces/permissions.idl": [
@@ -664633,16 +665310,12 @@
    "3d3bad08219af2e422f2cb0d4cabeffa1f8a2b80",
    "support"
   ],
-  "interfaces/pointerevents-extension.idl": [
-   "1eb486d63a868ecc2f89bbfa6b53bfb5ab2c1457",
-   "support"
-  ],
   "interfaces/pointerevents.idl": [
-   "85a25aa444e3dd420f14fb8c380c9f7ce16445f2",
+   "f4405438632be3cad59ee52c7c62bca630df875f",
    "support"
   ],
   "interfaces/pointerlock.idl": [
-   "13f7a8be4822a13647e1c1a95bb02345fefb18d6",
+   "12e984b33c6a2a88d60d2953259f3beb6f7a0574",
    "support"
   ],
   "interfaces/presentation-api.idl": [
@@ -664662,7 +665335,7 @@
    "support"
   ],
   "interfaces/remote-playback.idl": [
-   "8321e59fb632bb078c7df7d2831cbddba9e1a50c",
+   "2b0d85316c20bbcbfb2c969c4d24144f01d39ae8",
    "support"
   ],
   "interfaces/reporting.idl": [
@@ -664670,15 +665343,15 @@
    "support"
   ],
   "interfaces/requestidlecallback.idl": [
-   "c763b50bde782bb484564b49e25068fff88f782b",
+   "b485dc07805fe864cf79abd1ec11a7e3ffb68d41",
    "support"
   ],
   "interfaces/resize-observer.idl": [
-   "8018fc4b22be815b0947821b72cd92d10b5892f4",
+   "9ac157a6328c3cdb6d50a241f1841365ef2ff709",
    "support"
   ],
   "interfaces/resource-timing.idl": [
-   "fc14253f5e9aebec47ce83da1afa938819015f51",
+   "cbc17683b260708656e6e75bf801107baefd907b",
    "support"
   ],
   "interfaces/screen-capture.idl": [
@@ -664742,7 +665415,7 @@
    "support"
   ],
   "interfaces/vibration.idl": [
-   "f4191d91d36fbed1544b49298a74105859073628",
+   "cc5cd194b558952dc5791b28ffe9a1d03bbc004b",
    "support"
   ],
   "interfaces/wai-aria.idl": [
@@ -664750,7 +665423,7 @@
    "support"
   ],
   "interfaces/wake-lock.idl": [
-   "b66c415e6aad71764ca117af0a7fdbfd619d9fd2",
+   "85d1863fa6f6d1422e00b430ed2b04e3619a19ec",
    "support"
   ],
   "interfaces/wasm-js-api.idl": [
@@ -664770,7 +665443,7 @@
    "support"
   ],
   "interfaces/web-nfc.idl": [
-   "9f726ece289dde08facf194c40b59539d8e799c2",
+   "340dab647d6c5156ada9af62b77f419063aeefa7",
    "support"
   ],
   "interfaces/web-share.idl": [
@@ -664778,7 +665451,7 @@
    "support"
   ],
   "interfaces/webaudio.idl": [
-   "3869d5d14a66c39e0281bb94a2e41ee5f2e395ba",
+   "674673d90b1e8fd3e6d182f25289948fc0290cac",
    "support"
   ],
   "interfaces/webauthn.idl": [
@@ -664798,7 +665471,7 @@
    "support"
   ],
   "interfaces/webmidi.idl": [
-   "aa3b1ac21c899d6030ceff49af7e672f34935bac",
+   "096e7a1db11cb788a19c3eeb5be6b3f8fc77ecbe",
    "support"
   ],
   "interfaces/webrtc-dscp.idl": [
@@ -664806,15 +665479,15 @@
    "support"
   ],
   "interfaces/webrtc-identity.idl": [
-   "23f02c3f12b67e3fa7b9ec0f8270bc2565946370",
+   "d1f2a6547609ed1a9614ace180dd15027eb9c791",
    "support"
   ],
   "interfaces/webrtc-stats.idl": [
-   "3e58254baa45dbd9f94307326bf3f6fedce53b60",
+   "dbb1c5773c565335478e0f9b52e52c144e7e139b",
    "support"
   ],
   "interfaces/webrtc.idl": [
-   "d828fae6b7c85440e57cb49d5669c33df12ac9cb",
+   "f24dabcf4f848ece9f45ae736a292bd6f7958ffd",
    "support"
   ],
   "interfaces/webusb.idl": [
@@ -665073,6 +665746,10 @@
    "e4b097e62ae3902cb971dba751d496685c566bf6",
    "testharness"
   ],
+  "intersection-observer/v2/position-relative.html": [
+   "4cdc429570036f0b3afbba24573c91574f836803",
+   "testharness"
+  ],
   "intersection-observer/v2/scaled-target.html": [
    "f48f0792d0fab626101f8a612a8c1108401134c7",
    "testharness"
@@ -665542,7 +666219,7 @@
    "testharness"
   ],
   "lint.whitelist": [
-   "23cf36a89a5ae1aa9718493f7e8e2bd68ceabb49",
+   "be6ae4f0314942a35632a1b0dc8b10dd9dd34657",
    "support"
   ],
   "loading/lazyload/common.js": [
@@ -667042,7 +667719,7 @@
    "support"
   ],
   "media-capabilities/decodingInfo.any.js": [
-   "edd58ac3409bcbab14277f38560c7045178a2dcb",
+   "67b90d9db652817ec0ffa449186293cc1aef661a",
    "testharness"
   ],
   "media-capabilities/decodingInfoEncryptedMedia.http.html": [
@@ -667050,11 +667727,11 @@
    "testharness"
   ],
   "media-capabilities/decodingInfoEncryptedMedia.https.html": [
-   "ca94d0b6499e2f81b715eaee0d4213b66b7d8b7d",
+   "9886c363fbf85ae4c1cec54212139055ff143104",
    "testharness"
   ],
   "media-capabilities/encodingInfo.html": [
-   "08a3f7569a185215e42f97ca9e9a9803a92c5d7c",
+   "4c0f3abd671e5a407cd77bd899ad4229a5561f75",
    "testharness"
   ],
   "media-capabilities/idlharness.any.js": [
@@ -678917,60 +679594,12 @@
    "0cc01909796fcce22401ef0ed2ffda3582f56634",
    "support"
   ],
-  "pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html": [
-   "c33aa2076f41930fecdd49eea67376e9875cfa5e",
-   "testharness"
-  ],
-  "pointerevents/extension/idlharness.window.js": [
-   "895a89109c6d75d287b8508f0d1a10fa3189a671",
-   "testharness"
-  ],
-  "pointerevents/extension/pointerevent_coalesced_events_attributes.html": [
-   "fa68124c829f46d24c4a2cda789890d27f11fe73",
-   "testharness"
-  ],
-  "pointerevents/extension/pointerevent_constructor.html": [
-   "60b579050a18270fa67d633476eb90803ca16a93",
-   "testharness"
-  ],
-  "pointerevents/extension/pointerevent_getCoalescedEvents_when_pointerlocked.html": [
-   "b8443767524b61d305351afcbe55bb8bab668b5e",
-   "testharness"
-  ],
-  "pointerevents/extension/pointerevent_getPredictedEvents_when_pointerlocked-manual.html": [
-   "eaf08d675a403aaf8bbf5a39e965af39a15d9d4e",
-   "manual"
-  ],
-  "pointerevents/extension/pointerevent_pointerrawupdate.html": [
-   "0f46583c9b5d83517a3028bfa735072ec306cccd",
-   "testharness"
-  ],
-  "pointerevents/extension/pointerevent_pointerrawupdate_in_pointerlock-manual.html": [
-   "704e44195f6db0653e7187119a6c485dbb3c32c5",
-   "manual"
-  ],
-  "pointerevents/extension/pointerevent_predicted_events_attributes-manual.html": [
-   "fdfcae1fc8efeaa57927147ef0f72340738b003f",
-   "manual"
-  ],
-  "pointerevents/extension/pointerevent_touch-action-pan-down-css_touch.html": [
-   "7b713f9e5c44055a933a230a0108963db3d2f805",
-   "testharness"
-  ],
-  "pointerevents/extension/pointerevent_touch-action-pan-left-css_touch.html": [
-   "f1becf3e7dbad8ae972cae1dcf2306ce663a0256",
-   "testharness"
-  ],
-  "pointerevents/extension/pointerevent_touch-action-pan-right-css_touch.html": [
-   "2c93b5505aea7848c8bae9f8e79050937b30d3b9",
+  "pointerevents/compat/pointerevent_touch-action-verification.html": [
+   "311d24b628e4a7897649205da157683e130dc23a",
    "testharness"
   ],
-  "pointerevents/extension/pointerevent_touch-action-pan-up-css_touch.html": [
-   "30fb3bdfd03ca9e1c7dad346e126292924fd9cf4",
-   "testharness"
-  ],
-  "pointerevents/extension/pointerevent_touch-action-verification.html": [
-   "178f7a68a58e45c510ad2723e634d30996e90fb9",
+  "pointerevents/compat/pointerevent_touch-action_two-finger_interaction.html": [
+   "c33aa2076f41930fecdd49eea67376e9875cfa5e",
    "testharness"
   ],
   "pointerevents/html/pointerevent_drag_interaction-manual.html": [
@@ -679029,8 +679658,12 @@
    "2acd5dc1287bb6b47a37b9fb23821fa1ebbbd517",
    "testharness"
   ],
+  "pointerevents/pointerevent_coalesced_events_attributes.html": [
+   "d30f71e940a5ebabb70f6309f663f25b2c5198b4",
+   "testharness"
+  ],
   "pointerevents/pointerevent_constructor.html": [
-   "b8a97d1a6bb7f7b895d16282a1231c335e35f650",
+   "0eb1ee5214e9ae714e158c2e29a02dc808b25ad0",
    "testharness"
   ],
   "pointerevents/pointerevent_disabled_form_control.html": [
@@ -679129,6 +679762,14 @@
    "07df04fc2046737997b70b50063825d292af90de",
    "testharness"
   ],
+  "pointerevents/pointerevent_pointerrawupdate.html": [
+   "74c14d932ff583b0a418ad38c9fda4e35e3555d4",
+   "testharness"
+  ],
+  "pointerevents/pointerevent_predicted_events_attributes-manual.html": [
+   "1276d3657f8fdbda3ec880ebba07128f65a7876f",
+   "manual"
+  ],
   "pointerevents/pointerevent_releasepointercapture_events_to_original_target.html": [
    "6f6d30e16e1c5376a1a5b57c0c65bc683e075334",
    "testharness"
@@ -679253,6 +679894,22 @@
    "2ff161a915c95d1c14916fede40ca76439813cc9",
    "testharness"
   ],
+  "pointerevents/pointerevent_touch-action-pan-down-css_touch.html": [
+   "804a5144f118fb32c5fdaf40409428b96c6fbef4",
+   "testharness"
+  ],
+  "pointerevents/pointerevent_touch-action-pan-left-css_touch.html": [
+   "99c7ad81328c828633fdedec2c9741301222f8b3",
+   "testharness"
+  ],
+  "pointerevents/pointerevent_touch-action-pan-right-css_touch.html": [
+   "c211e17b17c8fd5d817dc31de060d26a550d1a74",
+   "testharness"
+  ],
+  "pointerevents/pointerevent_touch-action-pan-up-css_touch.html": [
+   "565d0d1d3e4a5a2ce9a97f6fe6fcfc32677fdc5e",
+   "testharness"
+  ],
   "pointerevents/pointerevent_touch-action-pan-x-css_touch.html": [
    "d2b147da0a0157bb29c50b32185d51b65be23c45",
    "testharness"
@@ -679286,13 +679943,21 @@
    "testharness"
   ],
   "pointerevents/pointerevent_touch-action-verification.html": [
-   "80d61e0a6697208d65e4fc74e0289a0218f5aea1",
+   "6a47eaee278c0972699cc00a471393c2c703ec95",
    "testharness"
   ],
   "pointerevents/pointerlock/pointerevent_coordinates_when_locked.html": [
    "a79327252277d3b27e416e885b27ff6cb0b0bf5d",
    "testharness"
   ],
+  "pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html": [
+   "1aa381b466e7457874f8644da6bb302978f8a3f7",
+   "testharness"
+  ],
+  "pointerevents/pointerlock/pointerevent_getPredictedEvents_when_pointerlocked-manual.html": [
+   "aba08f14b80b037b297adf7b67f749374ac1397f",
+   "manual"
+  ],
   "pointerevents/pointerlock/pointerevent_movementxy.html": [
    "260ef4829cba212e77ad487f8e82d69d9e9e8e73",
    "testharness"
@@ -679317,6 +679982,10 @@
    "2421b1c1ce0d083fd6f9c84edcd6eaa909b67379",
    "testharness"
   ],
+  "pointerevents/pointerlock/pointerevent_pointerrawupdate_in_pointerlock-manual.html": [
+   "5bd2eef739bc0a6983ada2feb4d604d3d5b1ef9c",
+   "manual"
+  ],
   "pointerevents/pointerlock/resources/pointerevent_movementxy-iframe.html": [
    "627af3b61cad74bb112558169b1e66f6a24b1129",
    "support"
@@ -692798,15 +693467,15 @@
    "testharness"
   ],
   "resource-timing/crossorigin-sandwich-TAO.sub.html": [
-   "468d055af95b73c59f345065db76f927bf2473c3",
+   "695bd654bb57d35edbcdf8409aaf9c09af9f620e",
    "testharness"
   ],
   "resource-timing/crossorigin-sandwich-no-TAO.sub.html": [
-   "d90387b3bbda30224715f5b0602f603b2c2921d4",
+   "0c1d09684c7cef7d4c7f8b56b0cdbffebd5bad04",
    "testharness"
   ],
   "resource-timing/crossorigin-sandwich-partial-TAO.sub.html": [
-   "076a003b7c993d6e2e092c482733579595928c5f",
+   "2f44b78d2785e4d01a4dba8fe807d5fc57b9b9b3",
    "testharness"
   ],
   "resource-timing/document-domain-no-impact-loader.sub.html": [
@@ -692854,7 +693523,7 @@
    "testharness"
   ],
   "resource-timing/resource_TAO_cross_origin_redirect_chain.html": [
-   "054a0e5643e7d9464f27711599843910b57a05a9",
+   "292878bdde5f8f4e8f152b28c7658933e9432b4c",
    "testharness"
   ],
   "resource-timing/resource_TAO_match_origin.htm": [
@@ -693009,6 +693678,14 @@
    "cb762eff806849df46dc758ef7b98b63f27f54c9",
    "support"
   ],
+  "resource-timing/resources/blue-with-tao.png": [
+   "820f8cace2143bfc45c0c301e84b6c29b8630068",
+   "support"
+  ],
+  "resource-timing/resources/blue-with-tao.png.headers": [
+   "7296361df3d1c5755acdb825661dbd9a1807b64f",
+   "support"
+  ],
   "resource-timing/resources/blue.png": [
    "820f8cace2143bfc45c0c301e84b6c29b8630068",
    "support"
@@ -693162,7 +693839,7 @@
    "support"
   ],
   "resource-timing/resources/multi_redirect.py": [
-   "99387c15bb619e9006dc4a5fa161f1ab4ab66e93",
+   "037d986c7233d6f5434060f717a761aa0246b2e1",
    "support"
   ],
   "resource-timing/resources/navigate_back.html": [
@@ -693226,7 +693903,7 @@
    "support"
   ],
   "resource-timing/resources/webperftestharness.js": [
-   "203eb0d16b4f3ad8d22877ff7afc7064fe252892",
+   "8e04e52f9c57fafb6a599da3a1963aa6ed545e6f",
    "support"
   ],
   "resource-timing/resources/webperftestharnessextension.js": [
@@ -693378,7 +694055,7 @@
    "support"
   ],
   "resources/chromium/nfc-mock.js": [
-   "c0921b8ad82f77c72e4e879c8dbe655339646a93",
+   "b1de419ca20d67bc2e69d6a54a6fbff7d400912b",
    "support"
   ],
   "resources/chromium/sensor.mojom.js": [
@@ -693438,7 +694115,7 @@
    "support"
   ],
   "resources/chromium/webxr-test.js": [
-   "653dcac79f8f22e7143568fcf33543d210eb0127",
+   "c4bfec3547d42524c7d3df4a0cda47720466251c",
    "support"
   ],
   "resources/chromium/webxr-test.js.headers": [
@@ -693458,7 +694135,7 @@
    "support"
   ],
   "resources/sriharness.js": [
-   "d30d483e3296979ddce16b6118170a3a6c696e80",
+   "f0d284e57b9411d9c6056080ba8749e8f5671b39",
    "support"
   ],
   "resources/test/README.md": [
@@ -693773,6 +694450,14 @@
    "693d7e3c818ed7fbc5503d09c91b9da7f7139bac",
    "support"
   ],
+  "resources/test/tests/unit/promise_setup-timeout.html": [
+   "c4947feef42af835a0db16b44c03f96baa8001f1",
+   "support"
+  ],
+  "resources/test/tests/unit/promise_setup.html": [
+   "2abb10a476e6459afd9f2f59b15eb3932151017a",
+   "support"
+  ],
   "resources/test/tests/unit/single_test.html": [
    "ff766e66cec166984e6bd280ac2a1ec3a7b3ba64",
    "support"
@@ -693826,7 +694511,7 @@
    "support"
   ],
   "resources/testharness.js": [
-   "93809664ea347d575913186362d12635893ec1c3",
+   "f289e7797201d7d9fa569c2864649571bd50b54c",
    "support"
   ],
   "resources/testharness.js.headers": [
@@ -693858,11 +694543,11 @@
    "support"
   ],
   "screen-capture/feature-policy.https.html": [
-   "56c9e80a1307484a26ab370298789030a6fa350e",
+   "90b2019ef143048c0bbe010103cd8a15a92747ef",
    "testharness"
   ],
   "screen-capture/getdisplaymedia.https.html": [
-   "7427e3433d01682570126b4bfe967c240fd12d3e",
+   "284a145870e70db23a21309417e54f45122193f1",
    "testharness"
   ],
   "screen-capture/historical.https.html": [
@@ -695094,7 +695779,7 @@
    "support"
   ],
   "service-workers/cache-storage/resources/vary.py": [
-   "59e39bc2ae730a4cd3e1376dd003c9ffada4ed4a",
+   "a609d7e8758de9b4f13a1e2f1b622e6cae9fc9ad",
    "support"
   ],
   "service-workers/cache-storage/script-tests/cache-abort.js": [
@@ -696025,10 +696710,6 @@
    "176fcb494b664bae43feba0c793e52845df35257",
    "testharness"
   ],
-  "service-workers/service-worker/referer-toplevel-script-fetch.https.html": [
-   "f0dd843eef8f8549430b78ce2606d83a59e2fb42",
-   "testharness"
-  ],
   "service-workers/service-worker/referer.https.html": [
    "0957e4c5330168b08236ff7c431706a1d92cc1a4",
    "testharness"
@@ -696037,6 +696718,10 @@
    "05d773e3144dca2c7639e4ef520a55d0eacf675d",
    "testharness"
   ],
+  "service-workers/service-worker/referrer-toplevel-script-fetch.https.html": [
+   "1a9bcf323d0b9b9930c70fd8cabe0ca5653a22ec",
+   "testharness"
+  ],
   "service-workers/service-worker/register-closed-window.https.html": [
    "9c1b639bb757d02949746d3fa584db8bbf286066",
    "testharness"
@@ -697210,11 +697895,11 @@
    "support"
   ],
   "service-workers/service-worker/resources/test-request-headers-worker.js": [
-   "71aff5e503745faa1376dfb359119023cb1bcfc1",
+   "8d475912dcf9617aea5d0c9801603cd830f6bd4d",
    "support"
   ],
   "service-workers/service-worker/resources/test-request-headers-worker.py": [
-   "5666f19e7904b007ac5c3e4ed95617d9affa92ce",
+   "d3057057763ca31416c9b3afebf2ea03b9d94ba5",
    "support"
   ],
   "service-workers/service-worker/resources/testharness-helpers.js": [
@@ -697682,7 +698367,7 @@
    "testharness"
   ],
   "shadow-dom/focus/focus-method-delegatesFocus.html": [
-   "9c61f663f88a177e1a0c1c6be6a35a40b120d8d7",
+   "30d60f975d9ab46d578d364b1aa040be4494cd03",
    "testharness"
   ],
   "shadow-dom/focus/focus-selector-delegatesFocus.html": [
@@ -697745,6 +698430,10 @@
    "2490f05b3e80aa67a0c70a9cb12be282fa0e15b2",
    "testharness"
   ],
+  "shadow-dom/innerHTML-setter.xhtml": [
+   "0122707e2a917e4b52142733995cfedc1e777edc",
+   "testharness"
+  ],
   "shadow-dom/input-element-list.html": [
    "b571534eb0d6f3f57cfbec3e706648b19848b6d6",
    "testharness"
@@ -703661,10 +704350,26 @@
    "862e5fde273a5b8ad467f8e062b3bb9ec16e5242",
    "testharness"
   ],
+  "svg/struct/reftests/reference/green-100x100.html": [
+   "f718ea6abfbab54333ba674ff0dcd320d8672bcd",
+   "support"
+  ],
   "svg/struct/reftests/reference/green-100x100.svg": [
    "120941444a4898197d6b6001f9908a6cd48b62ba",
    "support"
   ],
+  "svg/struct/reftests/support/etag-max-age-zero-icons.svg": [
+   "6f7fb0f830158972800e2c5c6d8f8de6a53bf2c8",
+   "support"
+  ],
+  "svg/struct/reftests/support/etag-max-age-zero-icons.svg.headers": [
+   "3f0c26c8feaf58e51ef387c972c2b772166d0fe8",
+   "support"
+  ],
+  "svg/struct/reftests/use-external-resource-with-revalidation.tentative.html": [
+   "d899165fa9ccef15d893b599ec6a8f4e005bcb36",
+   "reftest"
+  ],
   "svg/struct/reftests/use-svg-dimensions-override-001.svg": [
    "c658adce80f82d5ce6457101ecd3b3d3f562ddd9",
    "reftest"
@@ -704365,6 +705070,10 @@
    "1e388dfa7419a21b20503b3075c36bc11136dd7d",
    "support"
   ],
+  "tools/ci/pr_preview.py": [
+   "ba7774446e0836e319c0d071d6262e562fb146e1",
+   "support"
+  ],
   "tools/ci/run_tc.py": [
    "be7dbe082a1709493b62316d15668ea10ae93607",
    "support"
@@ -704381,6 +705090,10 @@
    "94f7998770cf5d8bad36d188dd63e253f98199a8",
    "support"
   ],
+  "tools/ci/tests/test_pr_preview.py": [
+   "63482fb184c7f14db0ebd45c18794e3a9771c90b",
+   "support"
+  ],
   "tools/ci/tests/test_run_tc.py": [
    "a72dcfe5cfdd516528312488c0d731557fb85492",
    "support"
@@ -705094,7 +705807,7 @@
    "support"
   ],
   "tools/requirements_flake8.txt": [
-   "ae35da67e53fcc348054d10c9e498e5fcbca06ed",
+   "0a45224016417cddbf59209196380cce0a089edf",
    "support"
   ],
   "tools/requirements_mypy.txt": [
@@ -709110,7 +709823,7 @@
    "support"
   ],
   "tools/tox.ini": [
-   "a330d0523486ca0b3f5e7d4e00567f8a0b60200e",
+   "7a5c1eb648a97aebc718912cb22492385c588439",
    "support"
   ],
   "tools/webdriver/.gitignore": [
@@ -709126,15 +709839,15 @@
    "support"
   ],
   "tools/webdriver/webdriver/__init__.py": [
-   "217bfc6527228c140b14dfd783c8ec35a498e1b3",
+   "d860b9ea2533f032ca227ae63d8f2022b6d897c7",
    "support"
   ],
   "tools/webdriver/webdriver/client.py": [
-   "0bddd7b13738321ed57c6df1ed6f316b3a5c7eb5",
+   "0c5bbff5629868fdc48a1a41cf882fabe5617c1b",
    "support"
   ],
   "tools/webdriver/webdriver/error.py": [
-   "23ffc40b31ffc97439ee02b240df5b47ca685b3d",
+   "0647e7eb61f834b1de0eb07296e876ce38aa8a47",
    "support"
   ],
   "tools/webdriver/webdriver/protocol.py": [
@@ -709142,7 +709855,7 @@
    "support"
   ],
   "tools/webdriver/webdriver/transport.py": [
-   "e9574006365f892792af060e529fe3aef496124b",
+   "32ba31a2ae9a996a5c57fd04061293f317e5bf04",
    "support"
   ],
   "tools/wpt/__init__.py": [
@@ -709154,7 +709867,7 @@
    "support"
   ],
   "tools/wpt/browser.py": [
-   "fb10d75631305bd66044f033d3ac8f5e8ffb4a0b",
+   "e7d57d8638c231f9c3c65e932bdc0209ba3cb021",
    "support"
   ],
   "tools/wpt/commands.json": [
@@ -709190,7 +709903,7 @@
    "support"
   ],
   "tools/wpt/run.py": [
-   "44dfbc25fa58ca50dbfdb761f358692c2115a7a3",
+   "4c1f2c99128de8937dca01479b1b4c4319414f8b",
    "support"
   ],
   "tools/wpt/testfiles.py": [
@@ -709278,7 +709991,7 @@
    "support"
   ],
   "tools/wptrunner/requirements.txt": [
-   "60775f8259eb317203825ea8fd5c26c901db5fad",
+   "3cd01446e25bceb4dadef48259117bd057ea6f48",
    "support"
   ],
   "tools/wptrunner/requirements_android_webview.txt": [
@@ -709582,7 +710295,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executormarionette.py": [
-   "14f456aa4767d86eccd330f1ee691d4ef87f44ba",
+   "7a936592f8880553e7594d9a5e5c82a9f1c1642c",
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/executoropera.py": [
@@ -709670,11 +710383,11 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/formatters/chromium.py": [
-   "569239018a2b72cd0d7daee6b3ad27af38130d05",
+   "56435eabf4bbeadbee7afa294e3e0bb1e7685b99",
    "support"
   ],
   "tools/wptrunner/wptrunner/formatters/tests/test_chromium.py": [
-   "9bb72d957f4d46d411d06810db08ec7f11a72cd9",
+   "83c128ac5cb46a65373a2fea008c6ba60350fd8f",
    "support"
   ],
   "tools/wptrunner/wptrunner/formatters/wptreport.py": [
@@ -710341,6 +711054,10 @@
    "3a880a53778acb165fd5d957eeaca22685baf2b5",
    "testharness"
   ],
+  "trusted-types/TrustedType-AttributeNodes.tentative.html": [
+   "77eef9cf39e42a842117e0910c1e398d2c22cb51",
+   "testharness"
+  ],
   "trusted-types/TrustedTypePolicy-CSP-no-name.tentative.html": [
    "18819b20894644094684df6ca48d7e5a5b762d8e",
    "testharness"
@@ -710385,6 +711102,10 @@
    "0b1872abe5036d93618ae3849d52497511bb51b5",
    "testharness"
   ],
+  "trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html": [
+   "293444820216e17adb8c4f02a1615d7dfbfe2e6e",
+   "testharness"
+  ],
   "trusted-types/TrustedTypePolicyFactory-defaultPolicy.tentative.html": [
    "7ac09d8bb96c0ef163590db1552012651648b68b",
    "testharness"
@@ -710534,7 +711255,7 @@
    "support"
   ],
   "trusted-types/trusted-types-createHTMLDocument.tentative.html": [
-   "7a43b1f7b35f51d249b815a64eb26fdd90d529d1",
+   "df094a8d5bcd8d22ca57c23ab132aa1bec51594a",
    "testharness"
   ],
   "trusted-types/trusted-types-duplicate-names-list-report-only.tentative.html": [
@@ -714257,10 +714978,6 @@
    "dcb9432da83cb21b6f0403080d3c7b3b5df1659e",
    "testharness"
   ],
-  "visual-viewport/viewport-no-resize-event-on-overflow-recalc.html.ini": [
-   "f8d682fbf902cf7d65ed75c1bcdfd2d1f54980ac",
-   "support"
-  ],
   "visual-viewport/viewport-offset-manual.html": [
    "c216e405a3e78765b95c815c45809f152dd97e41",
    "manual"
@@ -715765,6 +716482,10 @@
    "f5a60b4e2c7bb3c70a45353c7734dd0dff51d780",
    "testharness"
   ],
+  "web-animations/animation-model/combining-effects/applying-interpolated-transform.html": [
+   "c101b5f0cfcf133e87da1323a5cffa71b2d5f4f8",
+   "testharness"
+  ],
   "web-animations/animation-model/combining-effects/applying-the-composited-result.html": [
    "336115e5779837241b4316bff5e2fec7e857e518",
    "testharness"
@@ -716206,19 +716927,19 @@
    "testharness"
   ],
   "web-nfc/NDEFReader-document-hidden-manual.https.html": [
-   "868cf1a968be65cd28c3ba2f5022f686c3c43b26",
+   "9cf42e83bf306b5272fd753461fb78c3c9a4992f",
    "manual"
   ],
   "web-nfc/NDEFReader_options.https.html": [
-   "81b051e28f4723624846d25aa49d16525c81d1a9",
+   "6901e5cdcb25cce0f3f3a02aed842b3524cc7b8a",
    "testharness"
   ],
   "web-nfc/NDEFReader_scan.https.html": [
-   "7c78a1c6008429dc348efa2c02c83c47e0a565a4",
+   "78160fbcb2ab11a8ebc80c39a6fd935eddc0844b",
    "testharness"
   ],
   "web-nfc/NDEFReader_scan_iframe.https.html": [
-   "e9720e98ef65555cf39170ae4026329f257a226c",
+   "9bdb07136821211214e7d2d838f92da3f1955bc4",
    "testharness"
   ],
   "web-nfc/NDEFReadingEvent_constructor.https.html": [
@@ -716226,7 +716947,7 @@
    "testharness"
   ],
   "web-nfc/NDEFRecord_constructor.https.html": [
-   "79ce8a076eda26a7657df6eba8b781f711a94abb",
+   "ea7b5e4950866ff7eeed5fd4ed127460b5ef6c33",
    "testharness"
   ],
   "web-nfc/NDEFWriter-document-hidden-manual.https.html": [
@@ -716234,7 +716955,7 @@
    "manual"
   ],
   "web-nfc/NDEFWriter_push.https.html": [
-   "6ac940f64b0e23d35c8b1c74da1efddb930f82f0",
+   "6c7aca9fe938184bbc7090339be86a790454c7b6",
    "testharness"
   ],
   "web-nfc/README.md": [
@@ -716250,7 +716971,7 @@
    "testharness"
   ],
   "web-nfc/resources/nfc-helpers.js": [
-   "e7be49e433773d2c0bb6604387e9c8fe1561f984",
+   "eb3006114c7c505a5737894e8dc7d1d0eeda8fa7",
    "support"
   ],
   "web-nfc/resources/support-iframe.html": [
@@ -716477,16 +717198,16 @@
    "2778493e3b6c12d4c00c77bd975e845063621522",
    "support"
   ],
-  "webaudio/the-audio-api/processing-model/cycle-witout-delay.html": [
-   "ed26ad2ced2c226d3388f1941653f921f6d93656",
+  "webaudio/the-audio-api/processing-model/cycle-without-delay.html": [
+   "cab0f6ca8e7f04fb97bd4087d00e936524ebead9",
    "testharness"
   ],
   "webaudio/the-audio-api/processing-model/delay-time-clamping.html": [
-   "3f8ed24429a7c4532610c7a42e366dc3aff0c7d6",
+   "b79f0de0e5871607c06f23a7d2a7beda4bb56c5c",
    "testharness"
   ],
   "webaudio/the-audio-api/processing-model/feedback-delay-time.html": [
-   "50c8e455b908af3bcb42b4fcfda157d54b9f9abe",
+   "96c2eb065866c3f42342e81c35fea50b75340939",
    "testharness"
   ],
   "webaudio/the-audio-api/the-analysernode-interface/.gitkeep": [
@@ -717189,6 +717910,10 @@
    "7857cf16aa0574bf1974186d327fd7dd9fb99403",
    "testharness"
   ],
+  "webaudio/the-audio-api/the-destinationnode-interface/destination.html": [
+   "cda5668a09b6cc4d3eade92b1f70e9d3a4cdb913",
+   "testharness"
+  ],
   "webaudio/the-audio-api/the-dynamicscompressornode-interface/.gitkeep": [
    "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
    "support"
@@ -718246,7 +718971,7 @@
    "support"
   ],
   "webdriver/tests/perform_actions/support/keys.py": [
-   "d30ee91b5a6175f623b04279f1151ba22de92c42",
+   "d4072f5a3f33d8422825e1fdc4f017ed7d79993b",
    "support"
   ],
   "webdriver/tests/perform_actions/support/mouse.py": [
@@ -718654,27 +719379,27 @@
    "support"
   ],
   "webgpu/suites/cts/command_buffer/basic.spec.js": [
-   "c4333c794d2d75ca0b09991da9b40cd864b2bb91",
+   "6762a563c56edafeb225df6af27bd4507825e56f",
    "support"
   ],
   "webgpu/suites/cts/command_buffer/compute/basic.spec.js": [
-   "8a5fc168a4d8fbed69ba5ee2009fc7049fdcf3a3",
+   "7abb291ca43e401b80019f29fa3cdc21175300fc",
    "support"
   ],
   "webgpu/suites/cts/command_buffer/copies.spec.js": [
-   "a93a1b2cbdf3e67724503f1a180cbdf45f5f5fc1",
+   "c5bae2ada80e3ac330625966d69564b3b8280726",
    "support"
   ],
   "webgpu/suites/cts/command_buffer/render/basic.spec.js": [
-   "89bbdd8a639891cade5dbf11f8cabb3020ab50d7",
+   "46b5c7a27c9bfc7f567de39449673494eb74c2ee",
    "support"
   ],
   "webgpu/suites/cts/command_buffer/render/rendering.spec.js": [
-   "54c627dfd35d7179d9f357c046afa77c8b9e116a",
+   "a5d7568dae594357bf94c26c5a07b020671442f1",
    "support"
   ],
   "webgpu/suites/cts/command_buffer/render/storeop.spec.js": [
-   "0326cf65ad69a1558a69b83df94622041d7eb1db",
+   "ae92995aa6b73eadd52b3342ff6737b91b413431",
    "support"
   ],
   "webgpu/suites/cts/examples.spec.js": [
@@ -718690,7 +719415,7 @@
    "support"
   ],
   "webgpu/suites/cts/gpu_test.js": [
-   "a324e8839e505ab4fcce98dbf49b9217bc52aa00",
+   "67429b9a2551628ab3c8623570dfdfb79104d385",
    "support"
   ],
   "webgpu/suites/cts/index.js": [
@@ -718722,11 +719447,11 @@
    "support"
   ],
   "webgpu/suites/cts/validation/error_scope.spec.js": [
-   "0ff9699a3ad3d8ef43176b3aeefb6c46d4796788",
+   "475d0835a0af8b31be25f57093a88762812c98b7",
    "support"
   ],
   "webgpu/suites/cts/validation/fences.spec.js": [
-   "6c5c9f9faa14a0b9f3ee2ff5bf6dc52a9fd4e8e6",
+   "2bc85261d3dc8107065fd957475ffd412fe071a7",
    "support"
   ],
   "webgpu/suites/cts/validation/queue_submit.spec.js": [
@@ -719770,7 +720495,7 @@
    "testharness"
   ],
   "webrtc/RTCSctpTransport-events.html": [
-   "dc4ea7bde13c5e92294d2924b5a818450fd498a4",
+   "57b691a9cd620fa3836d9e645c712e4cbdd40940",
    "testharness"
   ],
   "webrtc/RTCSctpTransport-maxChannels.html": [
diff --git a/tests/wpt/metadata/css/CSS2/floats/floats-in-table-caption-001.html.ini b/tests/wpt/metadata/css/CSS2/floats/floats-in-table-caption-001.html.ini
new file mode 100644
index 000000000000..86715ffc9c20
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/floats-in-table-caption-001.html.ini
@@ -0,0 +1,2 @@
+[floats-in-table-caption-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/linebox/animations/line-height-interpolation.html.ini b/tests/wpt/metadata/css/CSS2/linebox/animations/line-height-interpolation.html.ini
new file mode 100644
index 000000000000..bbc1d4c86649
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/linebox/animations/line-height-interpolation.html.ini
@@ -0,0 +1,2 @@
+[line-height-interpolation.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/css/CSS2/text/white-space-002.xht.ini b/tests/wpt/metadata/css/CSS2/text/white-space-002.xht.ini
deleted file mode 100644
index b1d1b14db72b..000000000000
--- a/tests/wpt/metadata/css/CSS2/text/white-space-002.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[white-space-002.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/text/white-space-003.xht.ini b/tests/wpt/metadata/css/CSS2/text/white-space-003.xht.ini
deleted file mode 100644
index 182a9fc2d1e7..000000000000
--- a/tests/wpt/metadata/css/CSS2/text/white-space-003.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[white-space-003.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/line-height-204.html.ini b/tests/wpt/metadata/css/CSS2/visudet/line-height-204.html.ini
deleted file mode 100644
index 3d28990c2831..000000000000
--- a/tests/wpt/metadata/css/CSS2/visudet/line-height-204.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-height-204.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini
deleted file mode 100644
index fb5b6fd00069..000000000000
--- a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[mix-blend-mode-paragraph.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/animations/background-image-interpolation.html.ini b/tests/wpt/metadata/css/css-backgrounds/animations/background-image-interpolation.html.ini
new file mode 100644
index 000000000000..85c15e881069
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/animations/background-image-interpolation.html.ini
@@ -0,0 +1,2 @@
+[background-image-interpolation.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini b/tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
deleted file mode 100644
index f20284a53962..000000000000
--- a/tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-repeat-round-roundup.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/standard-font-family-11.html.ini b/tests/wpt/metadata/css/css-fonts/standard-font-family-11.html.ini
new file mode 100644
index 000000000000..9b40109c2fe7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/standard-font-family-11.html.ini
@@ -0,0 +1,2 @@
+[standard-font-family-11.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/standard-font-family-12.html.ini b/tests/wpt/metadata/css/css-fonts/standard-font-family-12.html.ini
new file mode 100644
index 000000000000..806d60fbcc9c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/standard-font-family-12.html.ini
@@ -0,0 +1,2 @@
+[standard-font-family-12.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/standard-font-family-13.html.ini b/tests/wpt/metadata/css/css-fonts/standard-font-family-13.html.ini
new file mode 100644
index 000000000000..5ec5d1e3604a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/standard-font-family-13.html.ini
@@ -0,0 +1,2 @@
+[standard-font-family-13.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/standard-font-family-14.html.ini b/tests/wpt/metadata/css/css-fonts/standard-font-family-14.html.ini
new file mode 100644
index 000000000000..4465cb76dddc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/standard-font-family-14.html.ini
@@ -0,0 +1,2 @@
+[standard-font-family-14.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/standard-font-family-15.html.ini b/tests/wpt/metadata/css/css-fonts/standard-font-family-15.html.ini
new file mode 100644
index 000000000000..31e73c183c18
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/standard-font-family-15.html.ini
@@ -0,0 +1,2 @@
+[standard-font-family-15.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/standard-font-family-16.html.ini b/tests/wpt/metadata/css/css-fonts/standard-font-family-16.html.ini
new file mode 100644
index 000000000000..e59810cad311
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/standard-font-family-16.html.ini
@@ -0,0 +1,2 @@
+[standard-font-family-16.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
index 96cdabb08183..4b3e36cf7c92 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -332,3 +332,6 @@
   [Matching font-weight: '400' should prefer '450 460' over '500']
     expected: FAIL
 
+  [Matching font-stretch: '110%' should prefer '105%' over '100%']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-text/hyphens/hyphens-out-of-flow-001.html.ini b/tests/wpt/metadata/css/css-text/hyphens/hyphens-out-of-flow-001.html.ini
new file mode 100644
index 000000000000..be32a87e09c5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/hyphens/hyphens-out-of-flow-001.html.ini
@@ -0,0 +1,2 @@
+[hyphens-out-of-flow-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-normal-018.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-018.xht.ini
new file mode 100644
index 000000000000..693999d7f9de
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-018.xht.ini
@@ -0,0 +1,2 @@
+[line-break-normal-018.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018.xht.ini
new file mode 100644
index 000000000000..bd79bd226f90
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018.xht.ini
@@ -0,0 +1,2 @@
+[line-break-strict-018.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-001.html.ini b/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-001.html.ini
new file mode 100644
index 000000000000..ded993140ebc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-001.html.ini
@@ -0,0 +1,2 @@
+[text-transform-full-size-kana-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-002.html.ini b/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-002.html.ini
new file mode 100644
index 000000000000..047905d059be
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-002.html.ini
@@ -0,0 +1,2 @@
+[text-transform-full-size-kana-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-003.html.ini b/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-003.html.ini
new file mode 100644
index 000000000000..7e9e3e15a50a
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-003.html.ini
@@ -0,0 +1,2 @@
+[text-transform-full-size-kana-003.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-004.html.ini b/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-004.html.ini
new file mode 100644
index 000000000000..f90c86d0e3d9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-004.html.ini
@@ -0,0 +1,2 @@
+[text-transform-full-size-kana-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-004.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-004.html.ini
new file mode 100644
index 000000000000..240d1283c3a2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-004.html.ini
@@ -0,0 +1,2 @@
+[trailing-ideographic-space-004.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-007.html.ini b/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-007.html.ini
deleted file mode 100644
index 192f64b0826f..000000000000
--- a/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-007.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-break-break-all-007.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/word-break/word-break-keep-all-006.html.ini b/tests/wpt/metadata/css/css-text/word-break/word-break-keep-all-006.html.ini
deleted file mode 100644
index 3a512b4a1244..000000000000
--- a/tests/wpt/metadata/css/css-text/word-break/word-break-keep-all-006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[word-break-keep-all-006.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/css-transforms-3d-on-anonymous-block-001.html.ini b/tests/wpt/metadata/css/css-transforms/css-transforms-3d-on-anonymous-block-001.html.ini
deleted file mode 100644
index bbb2e5f171ef..000000000000
--- a/tests/wpt/metadata/css/css-transforms/css-transforms-3d-on-anonymous-block-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[css-transforms-3d-on-anonymous-block-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/animations/vertical-align-interpolation.html.ini b/tests/wpt/metadata/css/css-transitions/animations/vertical-align-interpolation.html.ini
new file mode 100644
index 000000000000..2a09131aa8e7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transitions/animations/vertical-align-interpolation.html.ini
@@ -0,0 +1,2 @@
+[vertical-align-interpolation.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/css/css-transitions/animations/z-index-interpolation.html.ini b/tests/wpt/metadata/css/css-transitions/animations/z-index-interpolation.html.ini
new file mode 100644
index 000000000000..99337227f8df
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transitions/animations/z-index-interpolation.html.ini
@@ -0,0 +1,2 @@
+[z-index-interpolation.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
index e35a452a1864..70a00a101f69 100644
--- a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -1,2 +1,2 @@
 [no-transition-from-ua-to-blocking-stylesheet.html]
-  expected: TIMEOUT
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
index 668c3f52a5bf..c364dd10b5c6 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-list-001.html.ini
@@ -14,3 +14,6 @@
   [<li>Outside 3</li>]
     expected: FAIL
 
+  [<li>Inside 1</li>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index e89282b04a19..6ef8bb1049ff 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -1,5 +1,4 @@
 [elementsFromPoint-iframes.html]
-  expected: CRASH
   [elementsFromPoint on the root document for points in iframe elements]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini b/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
deleted file mode 100644
index 239c35135e4a..000000000000
--- a/tests/wpt/metadata/css/cssom-view/offsetTopLeft-border-box.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[offsetTopLeft-border-box.html]
-  [container: 1]
-    expected: FAIL
-
-  [container: 0]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/scrollIntoView-horizontal-partially-visible.html.ini b/tests/wpt/metadata/css/cssom-view/scrollIntoView-horizontal-partially-visible.html.ini
new file mode 100644
index 000000000000..c18aa2dc3e9e
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/scrollIntoView-horizontal-partially-visible.html.ini
@@ -0,0 +1,4 @@
+[scrollIntoView-horizontal-partially-visible.html]
+  [scrollIntoView scrolls partially-visible child in both axes]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini
new file mode 100644
index 000000000000..d3f46c223771
--- /dev/null
+++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_html.html.ini
@@ -0,0 +1,2 @@
+[contenttype_html.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini
new file mode 100644
index 000000000000..c3916f8555dd
--- /dev/null
+++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini
@@ -0,0 +1,2 @@
+[contenttype_txt.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini
new file mode 100644
index 000000000000..cde6fe16ee26
--- /dev/null
+++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_xml.html.ini
@@ -0,0 +1,2 @@
+[contenttype_xml.html]
+  expected: CRASH
diff --git a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
index 939a36eb9d98..3d135f3bd664 100644
--- a/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
+++ b/tests/wpt/metadata/encoding/single-byte-decoder.html.ini
@@ -2,6 +2,7 @@
   type: testharness
 
 [single-byte-decoder.html?document]
+  expected: TIMEOUT
   [ISO-8859-4: iso_8859-4:1988 (document.characterSet and document.inputEncoding)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 152fb1234722..284ea0dcf02a 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,9 +309,6 @@
   [<iframe>: separate response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
@@ -321,6 +318,18 @@
   [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 5c0015928591..d2df9b78483b 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,3 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/fetch.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/fetch.tentative.https.sub.html.ini
index 3940ed7f391f..472df3afb5c0 100644
--- a/tests/wpt/metadata/fetch/metadata/fetch.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/fetch.tentative.https.sub.html.ini
@@ -1,19 +1,55 @@
 [fetch.tentative.https.sub.html]
-  [Same-origin fetch]
+  [CORS mode: sec-fetch-site]
     expected: FAIL
 
-  [Same-origin mode]
+  [Same-origin mode: sec-fetch-dest]
     expected: FAIL
 
-  [Cross-site fetch]
+  [Cross-site fetch: sec-fetch-dest]
     expected: FAIL
 
-  [Same-site fetch]
+  [Cross-site fetch: sec-fetch-site]
     expected: FAIL
 
-  [no-CORS mode]
+  [Same-origin fetch: sec-fetch-mode]
     expected: FAIL
 
-  [CORS mode]
+  [CORS mode: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-origin mode: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-origin mode: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin fetch: sec-fetch-site]
+    expected: FAIL
+
+  [Cross-site fetch: sec-fetch-mode]
+    expected: FAIL
+
+  [CORS mode: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-origin fetch: sec-fetch-dest]
+    expected: FAIL
+
+  [no-CORS mode: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-site fetch: sec-fetch-dest]
+    expected: FAIL
+
+  [no-CORS mode: sec-fetch-site]
+    expected: FAIL
+
+  [Same-site fetch: sec-fetch-site]
+    expected: FAIL
+
+  [no-CORS mode: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-site fetch: sec-fetch-mode]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/fetch.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/fetch.tentative.sub.html.ini
index 9383237b8b0c..6044ba7e2a4d 100644
--- a/tests/wpt/metadata/fetch/metadata/fetch.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/fetch.tentative.sub.html.ini
@@ -1,4 +1,10 @@
 [fetch.tentative.sub.html]
-  [http->https fetch (cross-scheme => cross-site)]
+  [http->https fetch (cross-scheme => cross-site): sec-fetch-dest]
+    expected: FAIL
+
+  [http->https fetch (cross-scheme => cross-site): sec-fetch-site]
+    expected: FAIL
+
+  [http->https fetch (cross-scheme => cross-site): sec-fetch-mode]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/history.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/history.tentative.https.sub.html.ini
index 42c34b2dad5b..49be6d288511 100644
--- a/tests/wpt/metadata/fetch/metadata/history.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/history.tentative.https.sub.html.ini
@@ -1,10 +1,38 @@
 [history.tentative.https.sub.html]
+  expected: TIMEOUT
   [back to same-origin-initiated navigation]
-    expected: FAIL
+    expected: TIMEOUT
 
   [back to same-site-initiated navigation]
-    expected: FAIL
+    expected: TIMEOUT
 
   [back to cross-site-initiated navigation]
     expected: FAIL
 
+  [back to cross-site-initiated navigation 1: sec-fetch-site]
+    expected: FAIL
+
+  [back to cross-site-initiated navigation 1: sec-fetch-mode]
+    expected: FAIL
+
+  [back to same-site-initiated navigation 1: sec-fetch-dest]
+    expected: FAIL
+
+  [back to cross-site-initiated navigation 1: sec-fetch-dest]
+    expected: FAIL
+
+  [back to same-origin-initiated navigation 1: sec-fetch-dest]
+    expected: FAIL
+
+  [back to same-site-initiated navigation 1: sec-fetch-mode]
+    expected: FAIL
+
+  [back to same-origin-initiated navigation 1: sec-fetch-mode]
+    expected: FAIL
+
+  [back to same-site-initiated navigation 1: sec-fetch-site]
+    expected: FAIL
+
+  [back to same-origin-initiated navigation 1: sec-fetch-site]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/metadata/iframe.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/iframe.tentative.sub.html.ini
index fe45c4e64713..7157772fb5f9 100644
--- a/tests/wpt/metadata/fetch/metadata/iframe.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/iframe.tentative.sub.html.ini
@@ -1,4 +1,10 @@
 [iframe.tentative.sub.html]
-  [Secure, cross-site (cross-scheme, same-host) iframe]
+  [Secure, cross-site (cross-scheme, same-host) iframe: sec-fetch-dest]
+    expected: FAIL
+
+  [Secure, cross-site (cross-scheme, same-host) iframe: sec-fetch-site]
+    expected: FAIL
+
+  [Secure, cross-site (cross-scheme, same-host) iframe: sec-fetch-mode]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/img.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/img.tentative.https.sub.html.ini
index 747ee23fa579..bc062ff6785d 100644
--- a/tests/wpt/metadata/fetch/metadata/img.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/img.tentative.https.sub.html.ini
@@ -1,10 +1,28 @@
 [img.tentative.https.sub.html]
-  [Cross-site image]
+  [Cross-site image: sec-fetch-mode]
     expected: FAIL
 
-  [Same-origin image]
+  [Same-origin image: sec-fetch-mode]
     expected: FAIL
 
-  [Same-site image]
+  [Cross-site image: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-site image: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-site image: sec-fetch-site]
+    expected: FAIL
+
+  [Same-site image: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin image: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin image: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-site image: sec-fetch-dest]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html.ini
index ff5d3abc74b2..b07ff2396be0 100644
--- a/tests/wpt/metadata/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html.ini
@@ -1,10 +1,28 @@
 [cross-site-redirect.tentative.https.sub.html]
-  [Cross-Site -> Cross-Site redirect]
+  [Cross-Site -> Cross-Site redirect: sec-fetch-site]
     expected: FAIL
 
-  [Cross-Site -> Same-Site redirect]
+  [Cross-Site -> Same-Origin redirect: sec-fetch-mode]
     expected: FAIL
 
-  [Cross-Site -> Same-Origin redirect]
+  [Cross-Site -> Cross-Site redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-Site -> Same-Site redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-Site -> Same-Site redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Cross-Site -> Same-Site redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [Cross-Site -> Cross-Site redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [Cross-Site -> Same-Origin redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [Cross-Site -> Same-Origin redirect: sec-fetch-site]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
index ea5a2ec1a126..aa3354e91b23 100644
--- a/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
@@ -1,4 +1,10 @@
 [multiple-redirect-cross-site.tentative.https.sub.html]
-  [Same-Origin -> Cross-Site -> Same-Origin redirect]
+  [Same-Origin -> Cross-Site -> Same-Origin redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Origin -> Cross-Site -> Same-Origin redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin -> Cross-Site -> Same-Origin redirect: sec-fetch-dest]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini
index bc785cbd0207..442b30f029d5 100644
--- a/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini
@@ -3,18 +3,27 @@
   [Https downgrade-upgrade object]
     expected: NOTRUN
 
-  [Https downgrade-upgrade iframe]
+  [Https downgrade-upgrade fetch() api]
+    expected: NOTRUN
+
+  [Https downgrade-upgrade embed]
+    expected: TIMEOUT
+
+  [Https downgrade-upgrade top level navigation: sec-fetch-mode]
     expected: FAIL
 
-  [Https downgrade-upgrade script => No headers]
+  [Https downgrade-upgrade script => No headers: sec-fetch-site]
     expected: FAIL
 
-  [Https downgrade-upgrade fetch() api]
-    expected: NOTRUN
+  [Https downgrade-upgrade iframe: sec-fetch-site]
+    expected: FAIL
 
-  [Https downgrade-upgrade top level navigation]
+  [Https downgrade-upgrade iframe: sec-fetch-mode]
     expected: FAIL
 
-  [Https downgrade-upgrade embed]
-    expected: TIMEOUT
+  [Https downgrade-upgrade script => No headers: sec-fetch-mode]
+    expected: FAIL
+
+  [Https downgrade-upgrade top level navigation: sec-fetch-site]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
index cb4a0801f78b..e0a5365e4c06 100644
--- a/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
@@ -1,4 +1,10 @@
 [multiple-redirect-same-site.tentative.https.sub.html]
-  [Same-Origin -> Same-Site -> Same-Origin redirect]
+  [undefined: sec-fetch-mode]
+    expected: FAIL
+
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html.ini
index 9e51e8ffd113..91f62c8f6bd2 100644
--- a/tests/wpt/metadata/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html.ini
@@ -3,18 +3,27 @@
   [Http upgrade embed]
     expected: TIMEOUT
 
-  [Http upgrade top level navigation]
+  [Http upgrade object]
+    expected: NOTRUN
+
+  [Http upgrade fetch() api]
+    expected: NOTRUN
+
+  [Http upgrade top level navigation: sec-fetch-site]
     expected: FAIL
 
-  [Http upgrade iframe]
+  [Http upgrade script => No headers: sec-fetch-mode]
     expected: FAIL
 
-  [Http upgrade script => No headers]
+  [Http upgrade iframe: sec-fetch-site]
     expected: FAIL
 
-  [Http upgrade object]
-    expected: NOTRUN
+  [Http upgrade iframe: sec-fetch-mode]
+    expected: FAIL
 
-  [Http upgrade fetch() api]
-    expected: NOTRUN
+  [Http upgrade top level navigation: sec-fetch-mode]
+    expected: FAIL
+
+  [Http upgrade script => No headers: sec-fetch-site]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
index 78170169bfcd..f45efac7238a 100644
--- a/tests/wpt/metadata/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
@@ -6,9 +6,6 @@
   [Https downgrade fetch() api]
     expected: NOTRUN
 
-  [Https downgrade script => No headers]
-    expected: FAIL
-
   [Https downgrade object]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html.ini
index 0ec11a20c116..6e1d96fac4e2 100644
--- a/tests/wpt/metadata/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html.ini
@@ -1,10 +1,28 @@
 [same-origin-redirect.tentative.https.sub.html]
-  [Same-Origin -> Cross-Site redirect]
+  [Same-Origin -> Cross-Site redirect: sec-fetch-site]
     expected: FAIL
 
-  [Same-Origin -> Same-Site redirect]
+  [Same-Origin -> Same-Site redirect: sec-fetch-mode]
     expected: FAIL
 
-  [Same-Origin -> Same-Origin redirect]
+  [Same-Origin -> Cross-Site redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [undefined: sec-fetch-mode]
+    expected: FAIL
+
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin -> Cross-Site redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Origin -> Same-Site redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin -> Same-Site redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html.ini
index 72a5cbe072e8..76d8a71238ab 100644
--- a/tests/wpt/metadata/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html.ini
@@ -1,10 +1,28 @@
 [same-site-redirect.tentative.https.sub.html]
-  [Same-Site -> Same-Origin redirect]
+  [Same-Site -> Same-Site redirect: sec-fetch-dest]
     expected: FAIL
 
-  [Same-Site -> Same-Site redirect]
+  [Same-Site -> Same-Origin redirect: sec-fetch-dest]
     expected: FAIL
 
-  [Same-Site -> Cross-Site redirect]
+  [Same-Site -> Same-Site redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Site -> Cross-Site redirect: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Site -> Same-Origin redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Site -> Cross-Site redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Site -> Same-Origin redirect: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Site -> Same-Site redirect: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Site -> Cross-Site redirect: sec-fetch-mode]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/script.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/script.tentative.https.sub.html.ini
index 08e38d7f7f35..5c4a9eab18f2 100644
--- a/tests/wpt/metadata/fetch/metadata/script.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/script.tentative.https.sub.html.ini
@@ -1,13 +1,37 @@
 [script.tentative.https.sub.html]
-  [Same-origin script]
+  [Cross-site script: sec-fetch-mode]
     expected: FAIL
 
-  [Cross-site script]
+  [Same-site script: sec-fetch-dest]
     expected: FAIL
 
-  [Same-origin CORS script]
+  [Cross-site script: sec-fetch-site]
     expected: FAIL
 
-  [Same-site script]
+  [Same-origin script: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-site script: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin script: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-origin CORS script: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-origin CORS script: sec-fetch-site]
+    expected: FAIL
+
+  [Same-origin CORS script: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-origin script: sec-fetch-site]
+    expected: FAIL
+
+  [Same-site script: sec-fetch-mode]
+    expected: FAIL
+
+  [Cross-site script: sec-fetch-dest]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html.ini
deleted file mode 100644
index 6fb669844e12..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[appcache.tentative.https.sub.html]
-  [Appcache!]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html.ini
deleted file mode 100644
index 19a76dbb7de1..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[embed.tentative.https.sub.html]
-  expected: TIMEOUT
-  [Cross-Site embed]
-    expected: NOTRUN
-
-  [Same-Site embed]
-    expected: NOTRUN
-
-  [Same-Origin embed]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html.ini
deleted file mode 100644
index a8276159e464..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[fetch-preflight.tentative.https.sub.html]
-  [Same-site fetch with preflight]
-    expected: FAIL
-
-  [Cross-site fetch with preflight]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html.ini
deleted file mode 100644
index 0fcd23391045..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[fetch-via-serviceworker--fallback.tentative.https.sub.html]
-  [Sec-Fetch headers after SW fallback]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html.ini
deleted file mode 100644
index ad0e96bd3349..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[fetch-via-serviceworker--respondWith.tentative.https.sub.html]
-  [Sec-Fetch headers after SW fallback]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html.ini
deleted file mode 100644
index 3940ed7f391f..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[fetch.tentative.https.sub.html]
-  [Same-origin fetch]
-    expected: FAIL
-
-  [Same-origin mode]
-    expected: FAIL
-
-  [Cross-site fetch]
-    expected: FAIL
-
-  [Same-site fetch]
-    expected: FAIL
-
-  [no-CORS mode]
-    expected: FAIL
-
-  [CORS mode]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html.ini
deleted file mode 100644
index 9383237b8b0c..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[fetch.tentative.sub.html]
-  [http->https fetch (cross-scheme => cross-site)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html.ini
deleted file mode 100644
index c78ebab74f5e..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[font.tentative.https.sub.html]
-  expected: ERROR
-  [font]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html.ini
deleted file mode 100644
index e668969d5484..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[frame.tentative.sub.html]
-  expected: TIMEOUT
-  [Secure, cross-site (cross-scheme, same-host) frame]
-    expected: TIMEOUT
-
-  [Non-secure cross-site iframe => No headers.]
-    expected: TIMEOUT
-
-  [Non-secure same-site iframe => No headers]
-    expected: TIMEOUT
-
-  [Non-secure same-origin iframe => No headers]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html.ini
deleted file mode 100644
index 42c34b2dad5b..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[history.tentative.https.sub.html]
-  [back to same-origin-initiated navigation]
-    expected: FAIL
-
-  [back to same-site-initiated navigation]
-    expected: FAIL
-
-  [back to cross-site-initiated navigation]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html.ini
deleted file mode 100644
index fe45c4e64713..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[iframe.tentative.sub.html]
-  [Secure, cross-site (cross-scheme, same-host) iframe]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html.ini
deleted file mode 100644
index 747ee23fa579..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[img.tentative.https.sub.html]
-  [Cross-site image]
-    expected: FAIL
-
-  [Same-origin image]
-    expected: FAIL
-
-  [Same-site image]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/navigation.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/navigation.https.sub.html.ini
deleted file mode 100644
index a53ed577de88..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/navigation.https.sub.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[navigation.https.sub.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html.ini
deleted file mode 100644
index 8e3bee8e2d67..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[object.tentative.https.sub.html]
-  expected: TIMEOUT
-  [Same-Origin object]
-    expected: TIMEOUT
-
-  [Cross-Site object]
-    expected: NOTRUN
-
-  [Same-Site object]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html.ini
deleted file mode 100644
index ace4812ca1b5..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[prefetch.tentative.https.sub.html]
-  expected: TIMEOUT
-  [<link rel='prefetch' href='https://www.web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='prefetch' href='https://www.not-web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='prefetch' href='https://web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [Browser supports prefetch.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html.ini
deleted file mode 100644
index 326d86df3ef2..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,59 +0,0 @@
-[preload.tentative.https.sub.html]
-  expected: TIMEOUT
-  [<link rel='preload' as='fetch' href='https://web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='script' href='https://www.web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='font' href='https://www.not-web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='script' href='https://www.not-web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='track' href='https://www.not-web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='image' href='https://web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='image' href='https://www.not-web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='track' href='https://web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [Browser supports preload.]
-    expected: FAIL
-
-  [<link rel='preload' as='fetch' href='https://www.not-web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='style' href='https://www.web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='font' href='https://web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='fetch' href='https://www.web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='image' href='https://www.web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='font' href='https://www.web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='style' href='https://www.not-web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='script' href='https://web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='track' href='https://www.web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
-  [<link rel='preload' as='style' href='https://web-platform.test:8443/...'>]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html.ini
deleted file mode 100644
index ff5d3abc74b2..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[cross-site-redirect.tentative.https.sub.html]
-  [Cross-Site -> Cross-Site redirect]
-    expected: FAIL
-
-  [Cross-Site -> Same-Site redirect]
-    expected: FAIL
-
-  [Cross-Site -> Same-Origin redirect]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
deleted file mode 100644
index ea5a2ec1a126..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[multiple-redirect-cross-site.tentative.https.sub.html]
-  [Same-Origin -> Cross-Site -> Same-Origin redirect]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini
deleted file mode 100644
index 3be5dd74adde..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[multiple-redirect-https-downgrade-upgrade.tentative.sub.html]
-  expected: ERROR
-  [multiple-redirect-https-downgrade-upgrade]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
deleted file mode 100644
index cb4a0801f78b..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[multiple-redirect-same-site.tentative.https.sub.html]
-  [Same-Origin -> Same-Site -> Same-Origin redirect]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html.ini
deleted file mode 100644
index 0378fd64538b..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[redirect-http-upgrade.tentative.sub.html]
-  expected: ERROR
-  [redirect-http-upgrade]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html.ini
deleted file mode 100644
index 2a9b3161b0fc..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[redirect-https-downgrade.tentative.sub.html]
-  expected: ERROR
-  [redirect-https-downgrade]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html.ini
deleted file mode 100644
index 0ec11a20c116..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-origin-redirect.tentative.https.sub.html]
-  [Same-Origin -> Cross-Site redirect]
-    expected: FAIL
-
-  [Same-Origin -> Same-Site redirect]
-    expected: FAIL
-
-  [Same-Origin -> Same-Origin redirect]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html.ini
deleted file mode 100644
index 72a5cbe072e8..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[same-site-redirect.tentative.https.sub.html]
-  [Same-Site -> Same-Origin redirect]
-    expected: FAIL
-
-  [Same-Site -> Same-Site redirect]
-    expected: FAIL
-
-  [Same-Site -> Cross-Site redirect]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.ini
deleted file mode 100644
index 6673e91722bf..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[report.tentative.https.sub.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html.ini
deleted file mode 100644
index 08e38d7f7f35..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[script.tentative.https.sub.html]
-  [Same-origin script]
-    expected: FAIL
-
-  [Cross-site script]
-    expected: FAIL
-
-  [Same-origin CORS script]
-    expected: FAIL
-
-  [Same-site script]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html.ini
deleted file mode 100644
index a1f13c53676f..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[serviceworker.tentative.https.sub.html]
-  [metadata for service worker scripts]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html.ini
deleted file mode 100644
index 9f6f794ddac4..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[sharedworker.tentative.https.sub.html]
-  expected: ERROR
-  [sharedworker]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html.ini
deleted file mode 100644
index 92fe2faad02f..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[style.tentative.https.sub.html]
-  [Same-Origin, cors style]
-    expected: FAIL
-
-  [Cross-Site style]
-    expected: FAIL
-
-  [Same-Site style]
-    expected: FAIL
-
-  [Same-Origin style]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html.ini
deleted file mode 100644
index 7fa0efeb57ce..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[track.tentative.https.sub.html]
-  expected: TIMEOUT
-  [Same-Site track]
-    expected: NOTRUN
-
-  [Same-Origin track]
-    expected: TIMEOUT
-
-  [Same-Origin, CORS track]
-    expected: NOTRUN
-
-  [Cross-Site track]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html.ini
deleted file mode 100644
index 21cbeae87cc3..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[trailing-dot.tentative.https.sub.html]
-  [Fetching a resource from a cross-site host, spelled with a trailing dot.]
-    expected: FAIL
-
-  [Fetching a resource from the same origin, but spelled with a trailing dot.]
-    expected: FAIL
-
-  [Fetching a resource from the same site, but spelled with a trailing dot.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html.ini
deleted file mode 100644
index 73e93bdf2e17..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[worker.tentative.https.sub.html]
-  [Same-Origin worker]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html.ini
deleted file mode 100644
index c07bd4dac168..000000000000
--- a/tests/wpt/metadata/fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[xslt.tentative.https.sub.html]
-  [Same-Origin xslt]
-    expected: FAIL
-
-  [Cross-site xslt]
-    expected: FAIL
-
-  [Same-site xslt]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/metadata/style.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/style.tentative.https.sub.html.ini
index 92fe2faad02f..107a0b0c7def 100644
--- a/tests/wpt/metadata/fetch/metadata/style.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/style.tentative.https.sub.html.ini
@@ -1,13 +1,37 @@
 [style.tentative.https.sub.html]
-  [Same-Origin, cors style]
+  [Cross-Site style: sec-fetch-dest]
     expected: FAIL
 
-  [Cross-Site style]
+  [Same-Site style: sec-fetch-dest]
     expected: FAIL
 
-  [Same-Site style]
+  [Cross-Site style: sec-fetch-site]
     expected: FAIL
 
-  [Same-Origin style]
+  [Same-Origin style: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Origin, cors style: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Site style: sec-fetch-mode]
+    expected: FAIL
+
+  [Same-Site style: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin, cors style: sec-fetch-site]
+    expected: FAIL
+
+  [Same-Origin style: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Origin, cors style: sec-fetch-dest]
+    expected: FAIL
+
+  [Same-Origin style: sec-fetch-site]
+    expected: FAIL
+
+  [Cross-Site style: sec-fetch-mode]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/worker.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/worker.tentative.https.sub.html.ini
index 73e93bdf2e17..dfca91cdfad2 100644
--- a/tests/wpt/metadata/fetch/metadata/worker.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/metadata/worker.tentative.https.sub.html.ini
@@ -1,4 +1,10 @@
 [worker.tentative.https.sub.html]
-  [Same-Origin worker]
+  [undefined: sec-fetch-mode]
+    expected: FAIL
+
+  [undefined: sec-fetch-site]
+    expected: FAIL
+
+  [undefined: sec-fetch-dest]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index a63e414f43a7..b7052af5b5c0 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+  [X-Content-Type-Options%3A%0D%0AX-Content-Type-Options%3A%20nosniff]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
index ea2c2136c2fe..d3de645928d0 100644
--- a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
@@ -8,7 +8,7 @@
     expected: FAIL
 
   [Embedded credentials are treated as network errors in new windows.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Embedded credentials matching the top-level are treated as network errors for cross-origin URLs.]
     expected: TIMEOUT
@@ -16,3 +16,6 @@
   [Embedded credentials matching the top-level are not treated as network errors for relative URLs.]
     expected: TIMEOUT
 
+  [Embedded credentials matching the top-level are not treated as network errors for same-origin URLs.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 000000000000..87b07c3e6704
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 000000000000..dc2e45516deb
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index 8f14a90e7005..b23214f6f39e 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -18,6 +18,3 @@
   [Set HTTP URL frame location.protocol to x]
     expected: FAIL
 
-  [Set data URL frame location.protocol to http+x]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
index dec4c579137c..16fa2c5cfc19 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -1,5 +1,4 @@
 [creating_browsing_context_test_01.html]
-  expected: TIMEOUT
   [first argument: absolute url]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini
index e150c9d848f1..23eefb8eaf96 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-screenx-screeny.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-screenx-screeny.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for legacy `screenx`, `screeny`]
     expected: FAIL
 
+  [features "screenx=-204" should NOT set "left=204"]
+    expected: TIMEOUT
+
+  [features "screeny=-204" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "screeny=-204.5" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "screeny=-0" should NOT set "top=204"]
+    expected: TIMEOUT
+
+  [features "screenx=-0" should NOT set "left=204"]
+    expected: TIMEOUT
+
+  [features "screenx=-204.5" should NOT set "left=204"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
index d1ed9088b2b5..9027336b4532 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-negative-width-height.html.ini
@@ -1,5 +1,24 @@
 [open-features-negative-width-height.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: negative values for `width`, `height`]
     expected: FAIL
 
+  [features "height=-404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=-404e1" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=-404.5" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "width=-404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "width=-404e1" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "width=-404.5" should NOT set "width=404"]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
index a70e9dbad4d8..4e44584b123a 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
@@ -1,32 +1,48 @@
 [open-features-non-integer-height.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `height`]
     expected: FAIL
 
   [features "height=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "height=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "height=/404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [top=0,left=0,width=401,: absence of feature "height" should be treated same as "height=0"]
+    expected: TIMEOUT
+
+  [top=0,left=0: absence of feature "height" should be treated same as "height=0"]
+    expected: TIMEOUT
+
+  [features "height=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "height=L404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
index 779531b4a989..fcaeae5336d9 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-innerheight.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `innerheight`]
     expected: FAIL
 
   [features "innerheight=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerheight=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "innerheight=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=L404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "innerheight=/404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
index 7a1b258d52e7..42327fedd27b 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-innerwidth.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `innerwidth`]
     expected: FAIL
 
   [features "innerwidth=405e-1" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405*3" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405.5" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405e1" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405.32" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405  " should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405LLl" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405/5" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "innerwidth=405^4" should set "width=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "innerwidth=/404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=_404" should NOT set "width=404"]
+    expected: TIMEOUT
+
+  [features "innerwidth=L404" should NOT set "width=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
index caba4124f0b4..a8e4fe06618c 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-left.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for feature `left`]
     expected: FAIL
 
   [features "left=105e1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105  " should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105/5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105e-1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105^4" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105LLl" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105.32" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105*3" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "left=105.5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "left=L104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "left=/104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "left=_104" should NOT set "left=104"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
index 9ace8a4cbdbb..64a08faf0e60 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-screenx.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `screenx`]
     expected: FAIL
 
   [features "screenx=105.5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105e1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105  " should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105*3" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105e-1" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105^4" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105LLl" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105/5" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screenx=105.32" should set "left=105"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "screenx=_104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "screenx=L104" should NOT set "left=104"]
+    expected: TIMEOUT
+
+  [features "screenx=/104" should NOT set "left=104"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
index a82bd0f981ac..4f22ef4ef29f 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
@@ -1,32 +1,42 @@
 [open-features-non-integer-screeny.html]
   type: testharness
+  expected: TIMEOUT
   [HTML: window.open `features`: non-integer values for legacy feature `screeny`]
     expected: FAIL
 
   [features "screeny=405^4" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405e-1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405LLl" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405e1" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405  " should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405/5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405*3" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405.32" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
 
   [features "screeny=405.5" should set "height=405"]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [features "screeny=_404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "screeny=L404" should NOT set "height=404"]
+    expected: TIMEOUT
+
+  [features "screeny=/404" should NOT set "height=404"]
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 442db3cb549a..2532dceabaca 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,4 +1,5 @@
 [embedded-opener-remove-frame.html]
+  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/dom/idlharness.https.html.ini b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
index 692dc849677f..5459bedf48d8 100644
--- a/tests/wpt/metadata/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/metadata/html/dom/idlharness.https.html.ini
@@ -1409,6 +1409,9 @@
   [SubmitEvent interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
+  [FormDataEvent interface object length]
+    expected: FAIL
+
 
 [idlharness.https.html?include=(Document|Window)]
   [Document interface: documentWithHandlers must inherit property "queryCommandEnabled(DOMString)" with the proper type]
diff --git a/tests/wpt/metadata/html/dom/usvstring-reflection.https.html.ini b/tests/wpt/metadata/html/dom/usvstring-reflection.https.html.ini
index 8036ce5d6a61..4414b3ae6ec5 100644
--- a/tests/wpt/metadata/html/dom/usvstring-reflection.https.html.ini
+++ b/tests/wpt/metadata/html/dom/usvstring-reflection.https.html.ini
@@ -26,3 +26,9 @@
   [RegisterPtotocolHandler URL: unpaired surrogate codepoint should not make any exceptions.]
     expected: FAIL
 
+  [RegisterProtocolHandler URL: unpaired surrogate codepoint should not make any exceptions.]
+    expected: FAIL
+
+  [UnregisterProtocolHandler URL: unpaired surrogate codepoint should not make any exceptions.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index f42f518d257d..fc37df7e3fa1 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 5f60c78e73cd..f6a7aca3306c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index e440b1e38c61..dc856a3d5a31 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 7e8c936a9196..65424f7891a6 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -13,3 +13,6 @@
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: NOTRUN
 
+  [Check that rel=noopener with target=_self does a normal load]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini b/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
index e5993b3eadf1..b4090ef9fe25 100644
--- a/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
+++ b/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
@@ -3,3 +3,12 @@
   [There should be one entry.]
     expected: FAIL
 
+  [redirectStart == 0 in cross-origin redirect with failing Timing-Allow-Origin.]
+    expected: FAIL
+
+  [redirectEnd == 0 in cross-origin redirect with failing Timing-Allow-Origin.]
+    expected: FAIL
+
+  [startTime == fetchStart in cross-origin redirect with failing Timing-Allow-Origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/resource-timing/resource_timing_buffer_full_eventually.html.ini b/tests/wpt/metadata/resource-timing/resource_timing_buffer_full_eventually.html.ini
deleted file mode 100644
index 0a73b6ac31cf..000000000000
--- a/tests/wpt/metadata/resource-timing/resource_timing_buffer_full_eventually.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[resource_timing_buffer_full_eventually.html]
-  expected: CRASH
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-destinationnode-interface/destination.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-destinationnode-interface/destination.html.ini
new file mode 100644
index 000000000000..6ca11e2bbc92
--- /dev/null
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-destinationnode-interface/destination.html.ini
@@ -0,0 +1,4 @@
+[destination.html]
+  [\n      AudioDestinationNode\n    ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b5..000000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30d..000000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
deleted file mode 100644
index 064cf47545b5..000000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8a..000000000000
--- a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
index 268949ced5ce..f584fce5df19 100644
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
@@ -1,4 +1,5 @@
 [005.html]
+  expected: ERROR
   [dedicated worker in shared worker in dedicated worker]
     expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/mozilla/task_queue_throttling.any.js.ini b/tests/wpt/mozilla/meta/mozilla/task_queue_throttling.any.js.ini
deleted file mode 100644
index 39ea6c7ded63..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/task_queue_throttling.any.js.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[task_queue_throttling.any.worker.html]
-  [Throttling the performance timeline task queue.]
-    expected: FAIL
-
-
-[task_queue_throttling.any.html]
diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/web-platform-tests/.azure-pipelines.yml
index 82d5a8991936..fa0dc6705027 100644
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@@ -11,9 +11,7 @@
 # project is required:
 #  - The "Build pull requests from forks of this repository" setting must be
 #    enabled: https://docs.microsoft.com/en-us/azure/devops/pipelines/repos/github#validate-contributions-from-forks
-#  - Self-hosted agents for Windows 10 are used:
-#    - 'Hosted Windows Client' is the latest Windows 10
-#    - 'Hosted Windows Client Next' is Windows 10 Insider Preview
+#  - A self-hosted Windows 10 agent pool named 'Hosted Windows Client'.
 #    Documention for the setup of these agents:
 #    https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/v2-windows
 
diff --git a/tests/wpt/web-platform-tests/.github/workflows/detect_pull_request_preview.yml b/tests/wpt/web-platform-tests/.github/workflows/detect_pull_request_preview.yml
new file mode 100644
index 000000000000..d35105d9e3e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/.github/workflows/detect_pull_request_preview.yml
@@ -0,0 +1,24 @@
+name: pr-preview-detect
+on: deployment
+jobs:
+  detect-deployment:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v1
+      # By default, the "checkout" Action will attempt to check out the
+      # revision to be deployed. Because it does not fetch GitHub Pull Request
+      # branches, this will fail.
+      with:
+        ref: refs/heads/master
+    - name: Install dependency
+      run: pip install requests
+    - name: Detect deployment
+      run:
+        ./tools/ci/pr_preview.py
+          --host https://api.github.com
+          --github-project web-platform-tests/wpt
+          detect
+          --target https://wptpr.live
+          --timeout 600
+      env:
+        DEPLOY_TOKEN: ${{ secrets.DEPLOY_TOKEN }}
diff --git a/tests/wpt/web-platform-tests/.github/workflows/epochs.yml b/tests/wpt/web-platform-tests/.github/workflows/epochs.yml
index 5000d4c3dc43..78aaf16d18a4 100644
--- a/tests/wpt/web-platform-tests/.github/workflows/epochs.yml
+++ b/tests/wpt/web-platform-tests/.github/workflows/epochs.yml
@@ -6,6 +6,8 @@ on:
     - cron: 10 */3 * * *
 jobs:
   update:
+    # Do not run this job on forks.
+    if: github.repository == "web-platform-tests/wpt"
     runs-on: ubuntu-18.04
     steps:
     - name: Checkout
diff --git a/tests/wpt/web-platform-tests/BackgroundSync/idlharness.https.any.js b/tests/wpt/web-platform-tests/BackgroundSync/idlharness.https.any.js
index 2c7d25dd3f6d..8d4b9a583f48 100644
--- a/tests/wpt/web-platform-tests/BackgroundSync/idlharness.https.any.js
+++ b/tests/wpt/web-platform-tests/BackgroundSync/idlharness.https.any.js
@@ -11,13 +11,11 @@ idl_test(
   idlArray => {
     const isServiceWorker = location.pathname.includes('.serviceworker.');
     if (isServiceWorker) {
-      idl_array.add_objects({
-        ServiceWorkerGlobalScope: ['self', 'onsync', 'onperiodicsync'],
+      idlArray.add_objects({
+        ServiceWorkerGlobalScope: ['self', 'onsync'],
         ServiceWorkerRegistration: ['registration'],
         SyncManager: ['registration.sync'],
-        PeriodicSyncManager: ['registration.periodicSync'],
-        SyncEevnt: ['new SyncEvent("tag", "lastChance")'],
-        PeriodicSyncEevnt: ['new PeriodicSyncEvent("tag")'],
+        SyncEvent: ['new SyncEvent("tag", "lastChance")'],
       });
   }
 }
diff --git a/tests/wpt/web-platform-tests/BackgroundSync/service_workers/sw.js b/tests/wpt/web-platform-tests/BackgroundSync/service_workers/sw.js
index ea2bab28c5a2..c8515ba49642 100644
--- a/tests/wpt/web-platform-tests/BackgroundSync/service_workers/sw.js
+++ b/tests/wpt/web-platform-tests/BackgroundSync/service_workers/sw.js
@@ -14,7 +14,3 @@ self.addEventListener('message', event => {
 self.addEventListener('sync', event => {
   sendMessageToDocument('sync event received!');
 });
-
-self.addEventListener('periodicsync', event => {
-  sendMessageToDocument('periodicsync event received!');
-});
diff --git a/tests/wpt/web-platform-tests/IndexedDB/key_invalid.htm b/tests/wpt/web-platform-tests/IndexedDB/key_invalid.htm
index 30759d5ef3e5..98c9140df9ff 100644
--- a/tests/wpt/web-platform-tests/IndexedDB/key_invalid.htm
+++ b/tests/wpt/web-platform-tests/IndexedDB/key_invalid.htm
@@ -124,6 +124,8 @@
     var recursive3 = [recursive];
     invalid_key('array member contains self', recursive3);
 
+    invalid_key('proxy of an array', new Proxy([1,2,3], {}));
+
 </script>
 
 <div id=log></div>
diff --git a/tests/wpt/web-platform-tests/PeriodicBackgroundSync/idlharness.https.any.js b/tests/wpt/web-platform-tests/PeriodicBackgroundSync/idlharness.https.any.js
new file mode 100644
index 000000000000..b0fc2a2d6c8e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/PeriodicBackgroundSync/idlharness.https.any.js
@@ -0,0 +1,38 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+// https://github.com/WICG/BackgroundSync/blob/master/spec/PeriodicBackgroundSync-index.html
+
+const idl = `
+partial interface ServiceWorkerGlobalScope {
+    attribute EventHandler onperiodicsync;
+};
+[
+  Exposed=(Window,Worker)
+] partial interface ServiceWorkerRegistration {
+    readonly attribute PeriodicSyncManager periodicSync;
+    readonly attribute SyncManager sync;
+};
+dictionary PeriodicSyncEventInit : ExtendableEventInit {
+    required DOMString tag;
+};
+[
+  Constructor(DOMString type, PeriodicSyncEventInit init),
+  Exposed=ServiceWorker
+] interface PeriodicSyncEvent : ExtendableEvent {
+    readonly attribute DOMString tag;
+};
+`;
+
+test(t => {
+  const idlArray = new IdlArray();
+  idlArray.add_idls(idl);
+  idlArray.add_objects({
+    ServiceWorkerGlobalScope: ['self', 'onperiodicsync'],
+    ServiceWorkerRegistration: ['registration'],
+    PeriodicSyncManager: ['registration.periodicSync'],
+    PeriodicSyncEvent: ['new PeriodicSyncEvent("tag")'],
+  });
+}, 'IDL test for Periodic Background Sync');
diff --git a/tests/wpt/web-platform-tests/BackgroundSync/periodicsync.https.window.js b/tests/wpt/web-platform-tests/PeriodicBackgroundSync/periodicsync.https.window.js
similarity index 92%
rename from tests/wpt/web-platform-tests/BackgroundSync/periodicsync.https.window.js
rename to tests/wpt/web-platform-tests/PeriodicBackgroundSync/periodicsync.https.window.js
index 4c8d2eb5f424..30384e0b3e4d 100644
--- a/tests/wpt/web-platform-tests/BackgroundSync/periodicsync.https.window.js
+++ b/tests/wpt/web-platform-tests/PeriodicBackgroundSync/periodicsync.https.window.js
@@ -5,7 +5,7 @@
 
 promise_test(async test => {
   const script = 'service_workers/sw.js';
-  const scope = 'service_workers/' + location.pathname;
+  const scope = 'service_workers' + location.pathname;
 
   const serviceWorkerRegistration =
       await service_worker_unregister_and_register(test, script, scope);
@@ -20,4 +20,3 @@ promise_test(async test => {
           'test_tag'),
       'register() must reject on pending and installing workers');
 }, 'Periodic Background Sync requires an activated Service Worker');
-
diff --git a/tests/wpt/web-platform-tests/PeriodicBackgroundSync/service_workers/sw.js b/tests/wpt/web-platform-tests/PeriodicBackgroundSync/service_workers/sw.js
new file mode 100644
index 000000000000..87351c1d2ffa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/PeriodicBackgroundSync/service_workers/sw.js
@@ -0,0 +1,16 @@
+// The source to post setup and completion results to.
+let source = null;
+
+function sendMessageToDocument(msg) {
+  source.postMessage(msg);
+}
+
+// Notify the document that the SW is registered and ready.
+self.addEventListener('message', event => {
+  source = event.source;
+  sendMessageToDocument('ready');
+});
+
+self.addEventListener('periodicsync', event => {
+  sendMessageToDocument('periodicsync event received!');
+});
diff --git a/tests/wpt/web-platform-tests/WebIDL/current-realm.html b/tests/wpt/web-platform-tests/WebIDL/current-realm.html
index e094624c6792..29e07d1f79ed 100644
--- a/tests/wpt/web-platform-tests/WebIDL/current-realm.html
+++ b/tests/wpt/web-platform-tests/WebIDL/current-realm.html
@@ -35,10 +35,11 @@
     ["createNodeIterator", document.head],
     ["createTreeWalker", document.head]].forEach(function(val) {
      test(function() {
-       var obj = self[0].document[val[0]](val[1], val[2])
+       const method = val.shift();
+       let obj = self[0].document[method](...val);
        assert_global(obj)
 
-       obj = Document.prototype[val[0]].call(self[0].document, val[1], val[2])
+       obj = Document.prototype[method].call(self[0].document, ...val);
        assert_global(obj)
      }, val[0])
    })
@@ -61,10 +62,11 @@
      ["getElementsByTagNameNS", null, "x"],
      ["getElementsByClassName", "x"]].forEach(function(val) {
      test(function() {
-       var obj = self[0].document[val[0]](val[1], val[2])
+       const method = val.shift();
+       const obj = self[0].document[method](...val);
        assert_global(obj)
 
-       var obj2 = Document.prototype[val[0]].call(self[0].document, val[1], val[2])
+       const obj2 = Document.prototype[method].call(self[0].document, ...val);
        assert_global(obj)
 
        assert_equals(obj, obj2) // XXX this might be controversial
@@ -75,10 +77,11 @@
      ["createDocument", null, "", null],
      ["createHTMLDocument", "x"]].forEach(function(val) {
      test(function() {
-       var obj = self[0].document.implementation[val[0]](val[1], val[2], val[3])
+       const method = val.shift();
+       let obj = self[0].document.implementation[method](...val);
        assert_global(obj)
 
-       obj = DOMImplementation.prototype[val[0]].call(self[0].document.implementation, val[1], val[2], val[3])
+       obj = DOMImplementation.prototype[method].call(self[0].document.implementation, ...val);
        assert_global(obj)
      }, val[0])
    })
@@ -87,10 +90,11 @@
      ["getNamedItem", "test"],
      ["getNamedItemNS", null, "test"]].forEach(function(val) {
      test(function() {
-       var obj = self[0].document.body.attributes[val[0]](val[1], val[2])
+       const method = val.shift();
+       const obj = self[0].document.body.attributes[method](...val);
        assert_global(obj)
 
-       var obj2 = NamedNodeMap.prototype[val[0]].call(self[0].document.body.attributes, val[1], val[2])
+       const obj2 = NamedNodeMap.prototype[method].call(self[0].document.body.attributes, ...val);
        assert_global(obj)
 
        assert_equals(obj, obj2)
@@ -138,12 +142,13 @@
    ;[["createImageData", 5, 5],
      ["getImageData", 5, 5, 5, 5]].forEach(function(val) {
      test(function() {
-       var c = self[0].document.createElement("canvas").getContext("2d"),
-           obj = c[val[0]](val[1], val[2], val[3], val[4]);
+       const method = val.shift();
+       const c = self[0].document.createElement("canvas").getContext("2d");
+       let obj = c[method](...val);
        assert_global(obj)
        assert_global(obj.data)
 
-       obj = CanvasRenderingContext2D.prototype[val[0]].call(c, val[1], val[2], val[3], val[4]);
+       obj = CanvasRenderingContext2D.prototype[method].call(c, ...val);
        assert_global(obj)
        assert_global(obj.data)
      }, val[0])
diff --git a/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/sequence-conversion.html b/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/sequence-conversion.html
index f878a2672e30..3b45310dd5fa 100644
--- a/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/sequence-conversion.html
+++ b/tests/wpt/web-platform-tests/WebIDL/ecmascript-binding/sequence-conversion.html
@@ -51,6 +51,27 @@
   assert_equals(callCount, 1, "@@iterator must only have been gotten once");
 }, "An array with an overridden Symbol.iterator");
 
+test(t => {
+  function* generatorFunc() {
+    yield ["foo", "bar"];
+    yield ["baz", "quux"];
+  }
+
+  let callCount = 0;
+  const obj = {};
+  Object.defineProperty(obj, Symbol.iterator, {
+    get() {
+      ++callCount;
+      return generatorFunc;
+    }
+  });
+
+  const searchParams = new URLSearchParams(obj);
+  assert_equals(searchParams.get("foo"), "bar");
+  assert_equals(searchParams.get("baz"), "quux");
+  assert_equals(callCount, 1, "@@iterator must only have been gotten once");
+}, "An object with an overriden Symbol.iterator");
+
 test(t => {
   const originalIterator = Object.getOwnPropertyDescriptor(Array.prototype, Symbol.iterator);
   t.add_cleanup(() => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/document_cookie.js b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_document_cookie.tentative.https.window.js
similarity index 97%
rename from tests/wpt/web-platform-tests/cookie-store/resources/document_cookie.js
rename to tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_document_cookie.tentative.https.window.js
index 980347f1d185..0a8b1bd21efc 100644
--- a/tests/wpt/web-platform-tests/cookie-store/resources/document_cookie.js
+++ b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_document_cookie.tentative.https.window.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: Observing 'change' events in document when cookies set via document.cookie
+// META: script=resources/cookie-test-helpers.js
+
 'use strict';
 
 cookie_test(async t => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/http_cookie_and_set_cookie_headers.js b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.tentative.https.window.js
similarity index 97%
rename from tests/wpt/web-platform-tests/cookie-store/resources/http_cookie_and_set_cookie_headers.js
rename to tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.tentative.https.window.js
index 0fcf6b604290..2028df5b4bf4 100644
--- a/tests/wpt/web-platform-tests/cookie-store/resources/http_cookie_and_set_cookie_headers.js
+++ b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_http_cookie_and_set_cookie_headers.tentative.https.window.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: Observing 'change' events in document when cookies set via Set-Cookie header
+// META: script=resources/cookie-test-helpers.js
+
 'use strict';
 
 cookie_test(async t => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/no_name_and_no_value.js b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.js
similarity index 88%
rename from tests/wpt/web-platform-tests/cookie-store/resources/no_name_and_no_value.js
rename to tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.js
index e0c11a6cb65b..fbf3acecd26e 100644
--- a/tests/wpt/web-platform-tests/cookie-store/resources/no_name_and_no_value.js
+++ b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_and_no_value.tentative.https.window.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: Observing 'change' events in document when modifications API is called with blank arguments
+// META: script=resources/cookie-test-helpers.js
+
 'use strict';
 
 cookie_test(async t => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/no_name_equals_in_value.js b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_equals_in_value.tentative.https.window.js
similarity index 89%
rename from tests/wpt/web-platform-tests/cookie-store/resources/no_name_equals_in_value.js
rename to tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_equals_in_value.tentative.https.window.js
index b6cfab525621..f1abb02ebc0b 100644
--- a/tests/wpt/web-platform-tests/cookie-store/resources/no_name_equals_in_value.js
+++ b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_equals_in_value.tentative.https.window.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: Observing 'change' events in document when setting a cookie value containing "="
+// META: script=resources/cookie-test-helpers.js
+
 'use strict';
 
 cookie_test(async t => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/no_name_multiple_values.js b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_multiple_values.tentative.https.window.js
similarity index 87%
rename from tests/wpt/web-platform-tests/cookie-store/resources/no_name_multiple_values.js
rename to tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_multiple_values.tentative.https.window.js
index 51ea5281c2ce..60c6c16518ae 100644
--- a/tests/wpt/web-platform-tests/cookie-store/resources/no_name_multiple_values.js
+++ b/tests/wpt/web-platform-tests/cookie-store/change_eventhandler_for_no_name_multiple_values.tentative.https.window.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: Observing 'change' events in document when modifications API is called multiple times with a blank name
+// META: script=resources/cookie-test-helpers.js
+
 'use strict';
 
 cookie_test(async t => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieListItem_attributes.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieListItem_attributes.tentative.https.any.js
similarity index 98%
rename from tests/wpt/web-platform-tests/cookie-store/cookieListItem_attributes.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieListItem_attributes.tentative.https.any.js
index bf8f845f2b18..1b1ae529767f 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieListItem_attributes.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieListItem_attributes.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: cookieListItem attributes
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 const kCurrentHostname = (new URL(self.location.href)).hostname;
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.tentative.https.any.js
similarity index 98%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.tentative.https.any.js
index dc073d8eb603..3a2b512bb100 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_arguments.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: cookieStore.delete() arguments
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 promise_test(async testCase => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_basic.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_basic.tentative.https.any.js
similarity index 76%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_basic.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_basic.tentative.https.any.js
index 8a3f7ed66da0..394e6ecc64ef 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_basic.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_basic.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: cookieStore.delete() return type
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 promise_test(async testCase => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_insecure.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_insecure.tentative.https.any.js
similarity index 86%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_insecure.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_insecure.tentative.https.any.js
index bb1907faf58d..911e2fbac556 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_insecure.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_delete_insecure.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: cookieStore.delete() with insecure cookies
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 promise_test(async t => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_arguments.tenative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_event_arguments.tentative.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_event_arguments.tenative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_event_arguments.tentative.https.window.js
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.tentative.https.any.js
similarity index 97%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.tentative.https.any.js
index a04aa8cd7ad6..6073fca3deb0 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_arguments.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: cookieStore.getAll() arguments
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 promise_test(async testCase => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_multiple.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_multiple.tentative.https.any.js
similarity index 89%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_multiple.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_multiple.tentative.https.any.js
index c09f4fc5f579..1b094af67b04 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_multiple.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_multiple.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: cookieStore.getAll() with multiple cookies
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 promise_test(async testCase => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_set_basic.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_set_basic.tentative.https.any.js
similarity index 76%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_set_basic.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_set_basic.tentative.https.any.js
index dd2adabd2283..f1be8208f386 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_set_basic.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_getAll_set_basic.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: Interaction between cookieStore.set() and cookieStore.getAll()
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 promise_test(async testCase => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.tentative.https.any.js
similarity index 97%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.tentative.https.any.js
index e338dd1bdbd0..73932c9bd5dd 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_arguments.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: cookieStore.get() arguments
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 promise_test(async testCase => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.tentative.https.any.js
similarity index 70%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.tentative.https.any.js
index 5ebf09d34463..fad175d8da79 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_delete_basic.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: Interaction between cookieStore.set() and cookieStore.delete()
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 promise_test(async testCase => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_basic.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_basic.tentative.https.any.js
similarity index 74%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_basic.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_basic.tentative.https.any.js
index deb7405f2ff0..79d2f4321de0 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_basic.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_basic.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: Interaction between cookieStore.set() and cookieStore.get()
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 promise_test(async testCase => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/resources/ordering.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_ordering.tentative.https.any.js
similarity index 92%
rename from tests/wpt/web-platform-tests/cookie-store/resources/ordering.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_ordering.tentative.https.any.js
index 86babd95edbc..0ec3feff2056 100644
--- a/tests/wpt/web-platform-tests/cookie-store/resources/ordering.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_get_set_ordering.tentative.https.any.js
@@ -1,6 +1,9 @@
+// META: title=Cookie Store API: Cookie ordering
+// META: global=!default,serviceworker,window
+
 'use strict';
 
-cookie_test(async t => {
+promise_test(async t => {
   await cookieStore.set('ordered-1', 'cookie-value1');
   await cookieStore.set('ordered-2', 'cookie-value2');
   await cookieStore.set('ordered-3', 'cookie-value3');
@@ -16,7 +19,7 @@ cookie_test(async t => {
 }, 'Set three simple origin session cookies sequentially and ensure ' +
             'they all end up in the cookie jar in order.');
 
-cookie_test(async t => {
+promise_test(async t => {
   await Promise.all([
     cookieStore.set('ordered-unordered1', 'unordered-cookie-value1'),
     cookieStore.set('ordered-unordered2', 'unordered-cookie-value2'),
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_set_arguments.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_set_arguments.tentative.https.any.js
similarity index 98%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_set_arguments.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_set_arguments.tentative.https.any.js
index ddc9981c92dd..9fd592d27cca 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_set_arguments.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_set_arguments.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: cookieStore.set() arguments
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 promise_test(async testCase => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/cookieStore_special_names.tentative.https.window.js b/tests/wpt/web-platform-tests/cookie-store/cookieStore_special_names.tentative.https.any.js
similarity index 90%
rename from tests/wpt/web-platform-tests/cookie-store/cookieStore_special_names.tentative.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/cookieStore_special_names.tentative.https.any.js
index c82883a6069e..a4b31178ab09 100644
--- a/tests/wpt/web-platform-tests/cookie-store/cookieStore_special_names.tentative.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/cookieStore_special_names.tentative.https.any.js
@@ -1,3 +1,6 @@
+// META: title=Cookie Store API: cookieStore.set()/get()/delete() for cookies with special names
+// META: global=!default,serviceworker,window
+
 'use strict';
 
 ['__Secure-', '__Host-'].forEach(prefix => {
diff --git a/tests/wpt/web-platform-tests/cookie-store/document_cookie.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/document_cookie.tentative.https.html
deleted file mode 100644
index 63ddd9f63bc4..000000000000
--- a/tests/wpt/web-platform-tests/cookie-store/document_cookie.tentative.https.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Async Cookies: document.cookie (HTTPS)</title>
-<meta name="help" href="https://github.com/WICG/cookie-store/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/cookie-test-helpers.js"></script>
-<script src="resources/document_cookie.js"></script>
diff --git a/tests/wpt/web-platform-tests/cookie-store/encoding.https.window.js b/tests/wpt/web-platform-tests/cookie-store/encoding.https.any.js
similarity index 85%
rename from tests/wpt/web-platform-tests/cookie-store/encoding.https.window.js
rename to tests/wpt/web-platform-tests/cookie-store/encoding.https.any.js
index f79b81d272c2..41ce747f8145 100644
--- a/tests/wpt/web-platform-tests/cookie-store/encoding.https.window.js
+++ b/tests/wpt/web-platform-tests/cookie-store/encoding.https.any.js
@@ -1,3 +1,5 @@
+// META: title=Cookie Store API: cookie encoding
+// META: global=!default,serviceworker,window
 // META: script=resources/cookie-test-helpers.js
 
 'use strict';
diff --git a/tests/wpt/web-platform-tests/cookie-store/http_cookie_and_set_cookie_headers.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/http_cookie_and_set_cookie_headers.tentative.https.html
deleted file mode 100644
index 0c3d8b12d46a..000000000000
--- a/tests/wpt/web-platform-tests/cookie-store/http_cookie_and_set_cookie_headers.tentative.https.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Async Cookies: HTTP Cookie and Set-Cookie headers (HTTPS)</title>
-<meta name="help" href="https://github.com/WICG/cookie-store/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/cookie-test-helpers.js"></script>
-<script src="resources/http_cookie_and_set_cookie_headers.js"></script>
diff --git a/tests/wpt/web-platform-tests/cookie-store/no_name_and_no_value.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/no_name_and_no_value.tentative.https.html
deleted file mode 100644
index 0f15dafa7ab6..000000000000
--- a/tests/wpt/web-platform-tests/cookie-store/no_name_and_no_value.tentative.https.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Async Cookies: Test No Name and No Value (HTTPS)</title>
-<meta name="help" href="https://github.com/WICG/cookie-store/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/cookie-test-helpers.js"></script>
-<script src="resources/no_name_and_no_value.js"></script>
diff --git a/tests/wpt/web-platform-tests/cookie-store/no_name_equals_in_value.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/no_name_equals_in_value.tentative.https.html
deleted file mode 100644
index de774550fe91..000000000000
--- a/tests/wpt/web-platform-tests/cookie-store/no_name_equals_in_value.tentative.https.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Async Cookies: Test No Name, '=' in Value (HTTPS)</title>
-<meta name="help" href="https://github.com/WICG/cookie-store/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/cookie-test-helpers.js"></script>
-<script src="resources/no_name_equals_in_value.js"></script>
diff --git a/tests/wpt/web-platform-tests/cookie-store/no_name_multiple_values.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/no_name_multiple_values.tentative.https.html
deleted file mode 100644
index 29cde813fc35..000000000000
--- a/tests/wpt/web-platform-tests/cookie-store/no_name_multiple_values.tentative.https.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Async Cookies: Test No Name, Multiple Values (HTTPS)</title>
-<meta name="help" href="https://github.com/WICG/cookie-store/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/cookie-test-helpers.js"></script>
-<script src="resources/no_name_multiple_values.js"></script>
diff --git a/tests/wpt/web-platform-tests/cookie-store/ordering.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/ordering.tentative.https.html
deleted file mode 100644
index 1873ed4e9c0d..000000000000
--- a/tests/wpt/web-platform-tests/cookie-store/ordering.tentative.https.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>Async Cookies: ordering (HTTPS)</title>
-<meta name="help" href="https://github.com/WICG/cookie-store/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/cookie-test-helpers.js"></script>
-<script src="resources/ordering.js"></script>
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_arguments.js b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_arguments.js
deleted file mode 100644
index 7e19c9851390..000000000000
--- a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_arguments.js
+++ /dev/null
@@ -1,16 +0,0 @@
-self.GLOBAL = {
-  isWindow: function() { return false; },
-  isWorker: function() { return true; },
-};
-importScripts("/resources/testharness.js");
-
-importScripts(
-    "cookieListItem_attributes.tentative.https.window.js",
-    "cookieStore_delete_arguments.tentative.https.window.js",
-    "cookieStore_get_arguments.tentative.https.window.js",
-    "cookieStore_getAll_arguments.tentative.https.window.js",
-    "cookieStore_getAll_multiple.tentative.https.window.js",
-    "cookieStore_set_arguments.tentative.https.window.js",
-    "cookieStore_special_names.tentative.https.window.js");
-
-done();
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_arguments.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_arguments.tentative.https.html
deleted file mode 100644
index 7d006926dac7..000000000000
--- a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_arguments.tentative.https.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>Async Cookies: cookieStore API argument handling in ServiceWorker</title>
-<link rel="help" href="https://github.com/WICG/cookie-store">
-<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-'use strict';
-
-(async () => {
-  const scope = 'does/not/exist';
-
-  const registration = await navigator.serviceWorker.register(
-      'serviceworker_cookieStore_arguments.js', {scope});
-  add_completion_callback(() => {
-    registration.unregister();
-  });
-
-  fetch_tests_from_worker(registration.installing);
-})();
-</script>
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_basic.js b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_basic.js
deleted file mode 100644
index 7461ef5f98d0..000000000000
--- a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_basic.js
+++ /dev/null
@@ -1,13 +0,0 @@
-self.GLOBAL = {
-  isWindow: function() { return false; },
-  isWorker: function() { return true; },
-};
-importScripts("/resources/testharness.js");
-
-importScripts(
-    "cookieStore_delete_basic.tentative.https.window.js",
-    "cookieStore_get_delete_basic.tentative.https.window.js",
-    "cookieStore_get_set_basic.tentative.https.window.js",
-    "cookieStore_getAll_set_basic.tentative.https.window.js");
-
-done();
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_basic.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_basic.tentative.https.html
deleted file mode 100644
index 379a8d764216..000000000000
--- a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_basic.tentative.https.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>Async Cookies: cookieStore basic API in ServiceWorker</title>
-<link rel="help" href="https://github.com/WICG/cookie-store">
-<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-'use strict';
-
-(async () => {
-  const scope = 'does/not/exist';
-
-  const registration = await navigator.serviceWorker.register(
-      'serviceworker_cookieStore_basic.js', {scope});
-  add_completion_callback(() => {
-    registration.unregister();
-  });
-
-  fetch_tests_from_worker(registration.installing);
-})();
-</script>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/animations/line-height-interpolation.html b/tests/wpt/web-platform-tests/css/CSS2/linebox/animations/line-height-interpolation.html
new file mode 100644
index 000000000000..db71ca0262ca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/linebox/animations/line-height-interpolation.html
@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>line-height interpolation</title>
+<link rel="help" href="https://www.w3.org/TR/CSS2/visudet.html#propdef-line-height">
+<meta name="assert" content="line-height supports animation by computation">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/interpolation-testcommon.js"></script>
+
+<style>
+.parent {
+  line-height: 30px;
+}
+
+.target {
+  display: inline-block;
+  font: 20px sans-serif;
+  line-height: 10px;
+}
+
+.expected {
+  color: green;
+  margin-right: 30px;
+}
+</style>
+<body>
+<template id="target-template">
+  <p>
+  v<br />v
+  </p>
+</template>
+</body>
+<script>
+test_interpolation({
+  property: 'line-height',
+  from: neutralKeyframe,
+  to: '20px',
+}, [
+  {at: -1, expect: '0px'},
+  {at: -0.3, expect: '7px'},
+  {at: 0, expect: '10px'},
+  {at: 0.3, expect: '13px'},
+  {at: 0.6, expect: '16px'},
+  {at: 1, expect: '20px'},
+  {at: 1.5, expect: '25px'},
+]);
+
+test_no_interpolation({
+  property: 'line-height',
+  from: 'initial',
+  to: '20px',
+});
+
+test_interpolation({
+  property: 'line-height',
+  from: 'inherit',
+  to: '20px',
+}, [
+  {at: -1, expect: '40px'},
+  {at: -0.3, expect: '33px'},
+  {at: 0, expect: '30px'},
+  {at: 0.3, expect: '27px'},
+  {at: 0.6, expect: '24px'},
+  {at: 1, expect: '20px'},
+  {at: 1.5, expect: '15px'},
+]);
+
+test_interpolation({
+  property: 'line-height',
+  from: 'unset',
+  to: '20px',
+}, [
+  {at: -1, expect: '40px'},
+  {at: -0.3, expect: '33px'},
+  {at: 0, expect: '30px'},
+  {at: 0.3, expect: '27px'},
+  {at: 0.6, expect: '24px'},
+  {at: 1, expect: '20px'},
+  {at: 1.5, expect: '15px'},
+]);
+
+test_interpolation({
+  property: 'line-height',
+  from: '4',
+  to: '14',
+}, [
+  {at: -1, expect: '0'},
+  {at: -0.3, expect: '1'},
+  {at: 0, expect: '4'},
+  {at: 0.3, expect: '7'},
+  {at: 0.6, expect: '10'},
+  {at: 1, expect: '14'},
+  {at: 1.5, expect: '19'},
+]);
+
+test_interpolation({
+  property: 'line-height',
+  from: '4px',
+  to: '14px',
+}, [
+  {at: -1, expect: '0px'},
+  {at: -0.3, expect: '1px'},
+  {at: 0, expect: '4px'},
+  {at: 0.3, expect: '7px'},
+  {at: 0.6, expect: '10px'},
+  {at: 1, expect: '14px'},
+  {at: 1.5, expect: '19px'},
+]);
+
+test_interpolation({
+  property: 'line-height',
+  from: 'normal',
+  to: 'normal',
+}, [
+  {at: -0.3, expect: 'normal'},
+  {at: 0, expect: 'normal'},
+  {at: 0.3, expect: 'normal'},
+  {at: 0.6, expect: 'normal'},
+  {at: 1, expect: 'normal'},
+  {at: 1.5, expect: 'normal'},
+]);
+
+test_no_interpolation({
+  property: 'line-height',
+  from: '4',
+  to: '14px',
+});
+
+test_no_interpolation({
+  property: 'line-height',
+  from: '14px',
+  to: 'normal',
+});
+
+test_no_interpolation({
+  property: 'line-height',
+  from: 'normal',
+  to: '4',
+});
+
+test_no_interpolation({
+  property: 'line-height',
+  from: '4',
+  to: 'normal',
+});
+
+test_no_interpolation({
+  property: 'line-height',
+  from: 'normal',
+  to: '14px',
+});
+
+test_no_interpolation({
+  property: 'line-height',
+  from: '14px',
+  to: '4',
+});
+
+test_no_interpolation({
+  property: 'line-height',
+  from: '4',
+  to: '14q',
+});
+
+test_interpolation({
+  property: 'line-height',
+  from: '4q',
+  to: '14q',
+}, [
+  {at: -1, expect: '0q'},
+  {at: -0.3, expect: '1q'},
+  {at: 0, expect: '4q'},
+  {at: 0.3, expect: '7q'},
+  {at: 0.6, expect: '10q'},
+  {at: 1, expect: '14q'},
+  {at: 1.5, expect: '19q'},
+]);
+
+test_no_interpolation({
+  property: 'line-height',
+  from: '14q',
+  to: 'normal',
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-image-interpolation.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-image-interpolation.html
new file mode 100644
index 000000000000..b442c4e9120f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-image-interpolation.html
@@ -0,0 +1,181 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#background-image">
+<meta name="test" content="background-image supports animation">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/interpolation-testcommon.js"></script>
+
+<style>
+.parent {
+  background-image: url(../resources/blue-100.png);
+  background-size: 0 0;
+}
+.target {
+  width: 100px;
+  height: 100px;
+  display: inline-block;
+  border: 10px solid black;
+  background-repeat: no-repeat;
+  background-image: url(../resources/blue-100.png);
+}
+.expected {
+  border-color: green;
+  margin-right: 2px;
+}
+</style>
+
+<body>
+<script>
+// Neutral to image
+var from = 'url(../resources/blue-100.png)';
+var to = 'url(../resources/green-100.png)';
+test_interpolation({
+  property: 'background-image',
+  from: neutralKeyframe,
+  to: to,
+}, [
+  {at: -0.3, expect: from},
+  {at: 0, expect: from},
+  {at: 0.3, expect: 'cross-fade(' + from + ', ' + to + ', 0.3)'},
+  {at: 0.6, expect: 'cross-fade(' + from + ', ' + to + ', 0.6)'},
+  {at: 1, expect: to},
+  {at: 1.5, expect: to},
+]);
+
+// initial to image
+to = 'url(../resources/green-100.png)';
+test_no_interpolation({
+  property: 'background-image',
+  from: 'initial',
+  to: to,
+});
+
+// inherit to image
+from = 'url(../resources/blue-100.png)';
+to = 'url(../resources/green-100.png)';
+test_interpolation({
+  property: 'background-image',
+  from: 'inherit',
+  to: to,
+}, [
+  {at: -0.3, expect: from},
+  {at: 0, expect: from},
+  {at: 0.3, expect: 'cross-fade(' + from + ', ' + to + ', 0.3)'},
+  {at: 0.6, expect: 'cross-fade(' + from + ', ' + to + ', 0.6)'},
+  {at: 1, expect: to},
+  {at: 1.5, expect: to},
+]);
+
+// unset to image
+test_no_interpolation({
+  property: 'background-image',
+  from: 'unset',
+  to: to,
+});
+
+// Image to image
+from = 'url(../resources/blue-100.png)';
+to = 'url(../resources/green-100.png)';
+test_interpolation({
+  property: 'background-image',
+  from: from,
+  to: to,
+}, [
+  {at: -0.3, expect: from},
+  {at: 0, expect: from},
+  {at: 0.3, expect: 'cross-fade(' + from + ', ' + to + ', 0.3)'},
+  {at: 0.6, expect: 'cross-fade(' + from + ', ' + to + ', 0.6)'},
+  {at: 1, expect: to},
+  {at: 1.5, expect: to},
+]);
+
+// Image to gradient
+from = 'url(../resources/blue-100.png)';
+to = 'linear-gradient(45deg, blue, orange)';
+test_no_interpolation({
+  property: 'background-image',
+  from: from,
+  to: to,
+});
+
+// Image to crossfade
+from = 'url(../resources/blue-100.png)';
+to = 'cross-fade(url(../resources/green-100.png), url(../resources/stripes-100.png), 0.5)';
+test_no_interpolation({
+  property: 'background-image',
+  from: from,
+  to: to,
+});
+
+// Gradient to gradient
+from = 'linear-gradient(-45deg, red, yellow)';
+to = 'linear-gradient(45deg, blue, orange)';
+test_no_interpolation({
+  property: 'background-image',
+  from: from,
+  to: to,
+});
+
+// Keyword to image
+from = 'none';
+to = 'url(../resources/green-100.png)';
+test_no_interpolation({
+  property: 'background-image',
+  from: from,
+  to: to,
+});
+
+// Multiple to multiple
+var fromA = 'url(../resources/stripes-100.png)';
+var fromB = 'url(../resources/blue-100.png)';
+var toA = 'url(../resources/blue-100.png)';
+var toB = 'url(../resources/stripes-100.png)';
+from = fromA + ', ' + fromB;
+to = toA + ', ' + toB;
+test_interpolation({
+  property: 'background-image',
+  from: from,
+  to: to,
+}, [
+  {at: -0.3, expect: from},
+  {at: 0, expect: from},
+  {at: 0.3, expect: 'cross-fade(' + fromA + ', ' + toA + ', 0.3), cross-fade(' + fromB + ', ' + toB + ', 0.3)'},
+  {at: 0.6, expect: 'cross-fade(' + fromA + ', ' + toA + ', 0.6), cross-fade(' + fromB + ', ' + toB + ', 0.6)'},
+  {at: 1, expect: to},
+  {at: 1.5, expect: to},
+]);
+
+// Single to multiple
+from = 'url(../resources/blue-100.png)';
+var toA = 'url(../resources/stripes-100.png)';
+var toB = 'url(../resources/green-100.png)';
+to = toA + ', ' + toB;
+test_interpolation({
+  property: 'background-image',
+  from: from,
+  to: to,
+}, [
+  // The interpolation of different numbers of background-images looks a bit strange here.
+  // Animating background-image is not specified to be possible however we do it for backwards compatibility.
+  // With this in mind we kept the implementation simple at the expense of this corner case because there is
+  // no official specification to support.
+  {at: -0.3, expect: from + ', ' + from},
+  {at: 0, expect: from},
+  {at: 0.3, expect: 'cross-fade(' + from + ', ' + toA + ', 0.3), cross-fade(' + from + ', ' + toB + ', 0.3)'},
+  {at: 0.6, expect: 'cross-fade(' + from + ', ' + toA + ', 0.6), cross-fade(' + from + ', ' + toB + ', 0.6)'},
+  {at: 1, expect: to},
+  {at: 1.5, expect: to},
+]);
+
+// Multiple mismatched types
+from = 'url(../resources/blue-100.png), none';
+to = 'url(../resources/stripes-100.png), url(../resources/green-100.png)';
+test_no_interpolation({
+  property: 'background-image',
+  from: from,
+  to: to,
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/blue-100.png b/tests/wpt/web-platform-tests/css/css-backgrounds/resources/blue-100.png
new file mode 100644
index 0000000000000000000000000000000000000000..f578ae72533c7746c8a4d2f6eef32a8137ee1f4b
GIT binary patch
literal 92
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<q3?#jD*u{YqbAV5XD+9y-u8K?HK(2_Vi(`m{
mWO9N8>*55Fo~A$te+CBD3I@jJqz5HHc?M5cKbLh*2~7Y2j}w&u

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/green-100.png b/tests/wpt/web-platform-tests/css/css-backgrounds/resources/green-100.png
new file mode 100644
index 0000000000000000000000000000000000000000..e45bbbe5c5760d905db4bf015b5b7faa27467c7f
GIT binary patch
literal 92
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<q3?#jD*u{YqbAV5XE5m;VlehybfLswz7sn6@
m$>anH*2M`TJxzfQ{tOJP6%35cNe@bZ@(iA?elF{r5}E+`niFII

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/stripes-100.png b/tests/wpt/web-platform-tests/css/css-backgrounds/resources/stripes-100.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfb6980439ae80abb5a93e392421e8c6d4cfdae2
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<q3?#jD*u{YqXMsm#F#`j)FbFd;%$g$s6l4qV
z32_C|@h8tMNe=!5WHFTl`2{ol)0rlu4CKjpx;Tbd_$Mc9_<!J!yqiJKC%4MQdjjui
c^dGZf`0Sx`_&U4$UZ6S#Pgg&ebxsLQ0FWdkI{*Lx

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/css/css-break/avoid-border-break.html b/tests/wpt/web-platform-tests/css/css-break/avoid-border-break.html
new file mode 100644
index 000000000000..56f47e83c57f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/avoid-border-break.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-break/#possible-breaks">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="margin-left:-100px; columns:2; column-fill:auto; column-gap:0; width:200px; height:200px;">
+  <div style="height:175px;"></div>
+  <div style="border:30px solid green; box-sizing:border-box; height:100px; background:green;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10-notref.html
new file mode 100644
index 000000000000..e977fdaf7647
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10-notref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUIRounded";
+    src: local("ui-rounded");
+}
+</style>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'AppleSystemUIRounded'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10.html
new file mode 100644
index 000000000000..5dde6348d398
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-10.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-10-notref.html"/>
+<meta name="assert" content="ui-rounded's bold in @font-face isn't synthetic"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUIRounded";
+    src: local("ui-rounded");
+}
+</style>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: bold 72px 'AppleSystemUIRounded'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11-notref.html
new file mode 100644
index 000000000000..7e876ced3132
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11-notref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11.html
new file mode 100644
index 000000000000..15abb9a30ae6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-11.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-11-notref.html"/>
+<meta name="assert" content="ui-serif works"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'ui-serif';">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12-notref.html
new file mode 100644
index 000000000000..7e876ced3132
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12-notref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12.html
new file mode 100644
index 000000000000..7c34b0b8ca3c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-12.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-12-notref.html"/>
+<meta name="assert" content="ui-monospace works"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'ui-monospace';">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13-notref.html
new file mode 100644
index 000000000000..7e876ced3132
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13-notref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13.html
new file mode 100644
index 000000000000..1f8186f482dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-13.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-13-notref.html"/>
+<meta name="assert" content="ui-rounded works"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'ui-rounded';">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14-notref.html
new file mode 100644
index 000000000000..7e876ced3132
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14-notref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14.html
new file mode 100644
index 000000000000..5b694ef09b32
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-14.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-14-notref.html"/>
+<meta name="assert" content="ui-serif in @font-face works"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUISerif";
+    src: local("ui-serif");
+}
+</style>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'AppleSystemUISerif';">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15-notref.html
new file mode 100644
index 000000000000..7e876ced3132
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15-notref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15.html
new file mode 100644
index 000000000000..2e21b833c962
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-15.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-15-notref.html"/>
+<meta name="assert" content="ui-monospace in @font-face works"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUIMonospace";
+    src: local("ui-monospace");
+}
+</style>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'AppleSystemUIMonospace';">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16-notref.html
new file mode 100644
index 000000000000..7e876ced3132
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16-notref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16.html
new file mode 100644
index 000000000000..0b470bd6407c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-16.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-16-notref.html"/>
+<meta name="assert" content="ui-rounded in @font-face works"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUIRounded";
+    src: local("ui-rounded");
+}
+</style>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'AppleSystemUIRounded';">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2-ref.html
new file mode 100644
index 000000000000..e19801ba7708
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+This test makes sure that the bold versions of the design system UI fonts work. The test passes if all the text below is bold.
+<div>
+<div style="display: inline-block; font: bold 72px 'ui-serif';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'ui-monospaced';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'ui-rounded';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px '.AppleSystemUIFontSerif';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px '.SF NS Mono';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px '.SF UI Mono';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px '.AppleSystemUIFontRounded';">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2.html
new file mode 100644
index 000000000000..4fbca52b6593
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-2.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="match" href="standard-font-family-2-ref.html"/>
+<meta name="assert" content="Bold versions of standard fonts work"/>
+</head>
+<body>
+This test makes sure that the bold versions of the design system UI fonts work. The test passes if all the text below is bold.
+<div>
+<div style="display: inline-block; font: bold 72px 'ui-serif'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'ui-monospaced'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'ui-rounded'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px '.AppleSystemUIFontSerif'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px '.SF NS Mono'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px '.SF UI Mono'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px '.AppleSystemUIFontRounded'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3-notref.html
new file mode 100644
index 000000000000..766851077ed8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3-notref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'ui-serif'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3.html
new file mode 100644
index 000000000000..38d2410a438f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-3.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-3-notref.html"/>
+<meta name="assert" content="ui-serif's bold isn't synthetic"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: bold 72px 'ui-serif'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4-notref.html
new file mode 100644
index 000000000000..bd3b02926745
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4-notref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'ui-monospaced'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4.html
new file mode 100644
index 000000000000..11146c9b71d5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-4.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-4-notref.html"/>
+<meta name="assert" content="ui-monospace's bold isn't synthetic"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: bold 72px 'ui-monospace'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5-notref.html
new file mode 100644
index 000000000000..531ac6cd9b28
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5-notref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'ui-rounded'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5.html
new file mode 100644
index 000000000000..7d2646bb1b71
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-5.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-5-notref.html"/>
+<meta name="assert" content="ui-rounded's bold isn't synthetic"/>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: bold 72px 'ui-rounded'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6-ref.html
new file mode 100644
index 000000000000..e9e24dfc62cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+This test makes sure that the design system UI fonts don't work unless they are accessed from their correct names. The test passes if all the text below is rendered in Times.
+<div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6.html
new file mode 100644
index 000000000000..9a5fd418bda3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-6.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="match" href="standard-font-family-6-ref.html"/>
+<meta name="assert" content="Standard fonts don't work in @font-face unless they are accessed from their correct names"/>
+<style>
+@font-face {
+    font-family: "DotAppleSystemUIFontSerif";
+    src: local(".AppleSystemUIFontSerif");
+}
+@font-face {
+    font-family: "DotSFNSMono";
+    src: local(".SF NS Mono");
+}
+@font-face {
+    font-family: "DotSFUIMono";
+    src: local(".SF UI Mono");
+}
+@font-face {
+    font-family: "DotAppleSystemUIFontRounded";
+    src: local(".AppleSystemUIFontRounded");
+}
+</style>
+</head>
+<body>
+This test makes sure that the design system UI fonts don't work unless they are accessed from their correct names. The test passes if all the text below is rendered in Times.
+<div>
+<div style="display: inline-block; font: 72px 'DotAppleSystemUIFontSerif';">HeJllo</div>
+<div style="display: inline-block; font: 72px 'DotSFNSMono';">HeJllo</div>
+<div style="display: inline-block; font: 72px 'DotSFUIMono';">HeJllo</div>
+<div style="display: inline-block; font: 72px 'DotAppleSystemUIFontRounded';">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7-ref.html
new file mode 100644
index 000000000000..4dad37fed3d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7-ref.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUISerif";
+    src: local("ui-serif");
+}
+@font-face {
+    font-family: "AppleSystemUIMonospaced";
+    src: local("ui-monospaced");
+}
+@font-face {
+    font-family: "AppleSystemUIRounded";
+    src: local("ui-rounded");
+}
+@font-face {
+    font-family: "DotAppleSystemUIFontSerif";
+    src: local(".AppleSystemUIFontSerif");
+}
+@font-face {
+    font-family: "DotSFNSMono";
+    src: local(".SF NS Mono");
+}
+@font-face {
+    font-family: "DotSFUIMono";
+    src: local(".SF UI Mono");
+}
+@font-face {
+    font-family: "DotAppleSystemUIFontRounded";
+    src: local(".AppleSystemUIFontRounded");
+}
+</style>
+</head>
+<body>
+This test makes sure that the bold versions of the design system UI fonts work in @font-face. The test passes if all the text below is bold.
+<div>
+<div style="display: inline-block; font: bold 72px 'AppleSystemUISerif';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'AppleSystemUIMonospaced';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'AppleSystemUIRounded';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'DotAppleSystemUIFontSerif';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'DotSFNSMono';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'DotSFUIMono';">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'DotAppleSystemUIFontRounded';">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7.html
new file mode 100644
index 000000000000..68ebe0e04e6a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-7.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="match" href="standard-font-family-7-ref.html"/>
+<meta name="assert" content="Bold versions of standard fonts work in @font-face"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUISerif";
+    src: local("ui-serif");
+}
+@font-face {
+    font-family: "AppleSystemUIMonospaced";
+    src: local("ui-monospaced");
+}
+@font-face {
+    font-family: "AppleSystemUIRounded";
+    src: local("ui-rounded");
+}
+@font-face {
+    font-family: "DotAppleSystemUIFontSerif";
+    src: local(".AppleSystemUIFontSerif");
+}
+@font-face {
+    font-family: "DotSFNSMono";
+    src: local(".SF NS Mono");
+}
+@font-face {
+    font-family: "DotSFUIMono";
+    src: local(".SF UI Mono");
+}
+@font-face {
+    font-family: "DotAppleSystemUIFontRounded";
+    src: local(".AppleSystemUIFontRounded");
+}
+</style>
+</head>
+<body>
+This test makes sure that the bold versions of the design system UI fonts work in @font-face. The test passes if all the text below is bold.
+<div>
+<div style="display: inline-block; font: bold 72px 'AppleSystemUISerif'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'AppleSystemUIMonospaced'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'AppleSystemUIRounded'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'DotAppleSystemUIFontSerif'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'DotSFNSMono'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'DotSFUIMono'; font-synthesis: none;">HeJllo</div>
+<div style="display: inline-block; font: bold 72px 'DotAppleSystemUIFontRounded'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8-notref.html
new file mode 100644
index 000000000000..00aa33cbab99
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8-notref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUISerif";
+    src: local("ui-serif");
+}
+</style>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'AppleSystemUISerif'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8.html
new file mode 100644
index 000000000000..b64cb8fb4cc0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-8.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-8-notref.html"/>
+<meta name="assert" content="ui-serif's bold in @font-face isn't synthetic"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUISerif";
+    src: local("ui-serif");
+}
+</style>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: bold 72px 'AppleSystemUISerif'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9-notref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9-notref.html
new file mode 100644
index 000000000000..b9d1569e5336
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9-notref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUIMonospaced";
+    src: local("ui-monospaced");
+}
+</style>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: 72px 'AppleSystemUIMonospaced'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9.html
new file mode 100644
index 000000000000..e5afe8ab9ae5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-9.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="mismatch" href="standard-font-family-9-notref.html"/>
+<meta name="assert" content="ui-monospace's bold in @font-face isn't synthetic"/>
+<style>
+@font-face {
+    font-family: "AppleSystemUIMonospace";
+    src: local("ui-monospace");
+}
+</style>
+</head>
+<body>
+<div>
+<div style="display: inline-block; font: bold 72px 'AppleSystemUIMonospace'; font-synthesis: none;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-ref.html
new file mode 100644
index 000000000000..e9e24dfc62cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+</head>
+<body>
+This test makes sure that the design system UI fonts don't work unless they are accessed from their correct names. The test passes if all the text below is rendered in Times.
+<div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+<div style="display: inline-block; font-size: 72px;">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family.html b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family.html
new file mode 100644
index 000000000000..907a437207c8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/standard-font-family.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#standard-font-families"/>
+<link rel="match" href="standard-font-family-ref.html"/>
+<meta name="assert" content="Standard fonts don't work unless they are accessed from their correct names"/>
+</head>
+<body>
+This test makes sure that the design system UI fonts don't work unless they are accessed from their correct names. The test passes if all the text below is rendered in Times.
+<div>
+<div style="display: inline-block; font: 72px '.AppleSystemUIFontSerif';">HeJllo</div>
+<div style="display: inline-block; font: 72px '.SF NS Mono';">HeJllo</div>
+<div style="display: inline-block; font: 72px '.SF UI Mono';">HeJllo</div>
+<div style="display: inline-block; font: 72px '.AppleSystemUIFontRounded';">HeJllo</div>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html
index 4be43ddba2de..4906638ee1da 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-containing-block-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks the behavior of the absolutely positioned elements with a grid container as containing block.">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html
index 7025ccf55e9d..6e5e9ac54df6 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/absolute-positioning-grid-container-parent-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks the behavior of the absolutely positioned elements with a grid container as parent.">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001.html
index ae074da1af5d..549335e49fb7 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-paint-positioned-children-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="match" href="grid-paint-positioned-children-001-ref.html">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   border: 2px solid black;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html
index aa687de2f8c4..2794df263eba 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001-ref.html
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>CSS Grid Layout Test: Grid positioned children writing modes reference test</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html
index d63b1894927b..8b9df8bebada 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-children-writing-modes-001.html
@@ -6,7 +6,7 @@
 <link rel="match" href="grid-positioned-children-writing-modes-001-ref.html">
 <meta name="assert" content="This test checks the behavior of the positioned grid children in combination with the writing modes and text direction properties.">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html
index 81ea909d0299..8d2621506024 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-001.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items don't avoid auto-fit tracks to collapse.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html
index 27fc722e6c31..c44474962fcf 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-002.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks tracks before the first in-flow item also collapse and positioned items don't have any impact.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html
index 1c893392a4be..cdfb84c0bf56 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-003.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items will use the area defined by the in-flow items, ignoring any collapsed track.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html
index 54b2ff79027f..56e81c2cd2d4 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-004.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items ignore collapsed gaps.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html
index 56f870f4ec08..c0dd12174185 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-005.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items ignore collapsed gaps, both before and after the first in-flow item .">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html
index e301d3493767..3cd46f475bef 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-006.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items ignore collapsed gaps but consider those between in-flow items inside their grid area.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .container {
   width: 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html
index 8c4621627fd7..32de532c38d2 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-and-autofit-tracks-007.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat" title="7.2.2.2. Repeat-to-fill: auto-fill and auto-fit repetitions">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#valdef-repeat-auto-fit">
 <meta name="assert" content="This test checks that positioned items ignore collapsed gaps even with non-empty tracks before and after.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .container {
   width: 250px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001.html
index 54146bce2581..f5e49fbffe57 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-001.html
@@ -6,7 +6,7 @@
 <link rel="match" href="grid-positioned-items-background-001-ref.html">
 <meta name="assert" content="This test checks that the background of positioned items is painted in the right position">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html
index 97ec1052f4be..81f4f10f5c5c 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-background-rtl-001.html
@@ -6,7 +6,7 @@
 <link rel="match" href="grid-positioned-items-background-rtl-001-ref.html">
 <meta name="assert" content="This test checks that the background of positioned items is painted in the right position using RTL direction.">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html
index ebff62aae9ad..0dfc2ad65bc1 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-align" title="10.5. Aligning the Grid: the justify-content and align-content properties">
 <meta name="assert" content="This test checks the behavior of the positioned items in a grid using content alignment.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html
index 628a63c7e793..30879181cb9a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-content-alignment-rtl-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-align" title="10.5. Aligning the Grid: the justify-content and align-content properties">
 <meta name="assert" content="This test checks the behavior of the positioned items in a grid using content alignment in RTL.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html
index b9f3343ea920..7fb11200d1b2 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#gutters" title="10.1. Gutters: the row-gap, column-gap, and gap properties">
 <meta name="assert" content="This test checks the behavior of the positioned items in a grid container with gaps.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002-rtl.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002-rtl.html
index 4ea6cd657235..9e1352b0de05 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002-rtl.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002-rtl.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#gutters">
 <meta name="assert" content="This test checks the behavior of the positioned items in a grid container with percentage and calc() gaps.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002.html
index 22b1b4b44bfb..46e8801bb67d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-002.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#gutters">
 <meta name="assert" content="This test checks the behavior of the positioned items in a grid container with percentage and calc() gaps.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html
index 16ab39df9fb1..8559ea583bbb 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-gaps-rtl-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#gutters" title="10.1. Gutters: the row-gap, column-gap, and gap properties">
 <meta name="assert" content="This test checks the behavior of the positioned items in a grid container with gaps in RTL.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html
index 4b1a3d0f342f..8e576bf4b7a8 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-001.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#implicit-grids" title="7.5. The Implicit Grid">
 <meta name="assert" content="This test checks the behavior of the absolutely positioned grid items placed on the implicit grid.">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html
index 8fc8918ee68b..e2b2bdb2003d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-implicit-grid-line-001.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#implicit-grids" title="7.5. The Implicit Grid">
 <meta name="assert" content="This test checks that grid placement properties of absolutely positioned items using implicit grid lines are treated as 'auto'.">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-padding-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-padding-001.html
index 643a68830d4a..bfadcac7ac6d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-padding-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-padding-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks that positioned grid items can be placed directly on the padding.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html
index 663dab45b3db..8dcb91ed6c8f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-unknown-named-grid-line-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks that grid placement properties of absolutely positioned items can reference implicit grid lines.">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html
index 5a31c35f2088..18d2ebff015a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-positioned-items-within-grid-implicit-track-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#implicit-grids" title="7.5. The Implicit Grid">
 <meta name="assert" content="This test checks that positioned grid items are placed properly (including implicit tracks) even if the grid has implicit tracks.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html
index e74b2b96fe62..b3716888c33a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/grid-sizing-positioned-items-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks the different size options for absolutely positioned grid items.">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html
index adb4a7acf275..82309e676b8c 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-create-implicit-tracks-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks that positioned items shouldn't create implicit tracks on the grid.">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html
index 50f9984370ba..7ea528b00f12 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-should-not-take-up-space-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#abspos" title="9. Absolute Positioning">
 <meta name="assert" content="This test checks that positioned items shouldn't take up space or otherwise participate in the layout of the grid.">
 <link rel="stylesheet" href="/fonts/ahem.css">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
 
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html
index ac5494ee30b9..cd0e378e3bf0 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001-ref.html
@@ -3,7 +3,7 @@
 <title>CSS Grid Layout Test: Positioned grid items sizing reference file</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <meta name="flags" content="ahem">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html
index 2f0056f4eeed..7fb303c0dd0d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/abspos/positioned-grid-items-sizing-001.html
@@ -6,7 +6,7 @@
 <link rel="match" href="positioned-grid-items-sizing-001-ref.html">
 <meta name="assert" content="This test checks that the sizing of positioned grid items without specific dimensions or offsets is equivalent to the size of regular items.">
 <meta name="flags" content="ahem">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-grid/abspos/support/grid.css b/tests/wpt/web-platform-tests/css/css-grid/abspos/support/grid.css
deleted file mode 100644
index 78fdd5e975ad..000000000000
--- a/tests/wpt/web-platform-tests/css/css-grid/abspos/support/grid.css
+++ /dev/null
@@ -1,283 +0,0 @@
-.grid {
-  display: grid;
-  background-color: grey;
-}
-
-.inline-grid {
-  display: inline-grid;
-  background-color: grey;
-}
-
-.firstRowFirstColumn {
-  background-color: blue;
-  grid-column: 1;
-  grid-row: 1;
-}
-
-.onlyFirstRowOnlyFirstColumn {
-  background-color: blue;
-  grid-column: 1 / 2;
-  grid-row: 1 / 2;
-}
-
-.firstRowSecondColumn {
-  background-color: lime;
-  grid-column: 2;
-  grid-row: 1;
-}
-
-.onlyFirstRowOnlySecondColumn {
-  background-color: lime;
-  grid-column: 2 / 3;
-  grid-row: 1 / 2;
-}
-
-.secondRowFirstColumn {
-  background-color: purple;
-  grid-column: 1;
-  grid-row: 2;
-}
-
-.onlySecondRowOnlyFirstColumn {
-  background-color: purple;
-  grid-column: 1 / 2;
-  grid-row: 2 / 3;
-}
-
-.secondRowSecondColumn {
-  background-color: orange;
-  grid-column: 2;
-  grid-row: 2;
-}
-
-.onlySecondRowOnlySecondColumn {
-  background-color: orange;
-  grid-column: 2 / 3;
-  grid-row: 2 / 3;
-}
-
-.endSecondRowEndSecondColumn {
-  background-color: orange;
-  grid-column-end: 3;
-  grid-row-end: 3;
-}
-
-.thirdRowSecondColumn {
-  background-color: red;
-  grid-column: 2;
-  grid-row: 3;
-}
-
-.thirdRowThirdColumn {
-  background-color: salmon;
-  grid-column: 3;
-  grid-row: 3;
-}
-
-.firstRowThirdColumn {
-  background-color: magenta;
-  grid-column: 3;
-  grid-row: 1;
-}
-
-.secondRowThirdColumn {
-  background-color: navy;
-  grid-column: 3;
-  grid-row: 2;
-}
-
-.firstRowFourthColumn {
-  background-color: green;
-  grid-column: 4;
-  grid-row: 1;
-}
-
-.secondRowFourthColumn {
-  background-color: pink;
-  grid-column: 4;
-  grid-row: 2;
-}
-
-.firstAutoRowSecondAutoColumn {
-  grid-row: 1 / auto;
-  grid-column: 2 / auto;
-}
-
-.autoLastRowAutoLastColumn {
-  grid-row: auto / -1;
-  grid-column: auto / -1;
-}
-
-.autoSecondRowAutoFirstColumn {
-  grid-row: auto / 2;
-  grid-column: auto / 1;
-}
-
-.firstRowBothColumn {
-  grid-row: 1;
-  grid-column: 1 / -1;
-}
-
-.secondRowBothColumn {
-  grid-row: 2;
-  grid-column: 1 / -1;
-}
-
-.bothRowFirstColumn {
-  grid-row: 1 / -1;
-  grid-column: 1;
-}
-
-.bothRowSecondColumn {
-  grid-row: 1 / -1;
-  grid-column: 2;
-}
-
-.bothRowBothColumn {
-  grid-row: 1 / -1;
-  grid-column: 1 / -1;
-}
-
-/* Auto column / row. */
-.autoRowAutoColumn {
-  background-color: pink;
-  grid-column: auto;
-  grid-row: auto;
-}
-
-.firstRowAutoColumn {
-  background-color: blue;
-  grid-column: auto;
-  grid-row: 1;
-}
-
-.secondRowAutoColumn {
-  background-color: purple;
-  grid-column: auto;
-  grid-row: 2;
-}
-
-.thirdRowAutoColumn {
-  background-color: navy;
-  grid-column: auto;
-  grid-row: 3;
-}
-
-.autoRowFirstColumn {
-  background-color: lime;
-  grid-column: 1;
-  grid-row: auto;
-}
-
-.autoRowSecondColumn {
-  background-color: orange;
-  grid-column: 2;
-  grid-row: auto;
-}
-
-.autoRowThirdColumn {
-  background-color: magenta;
-  grid-column: 3;
-  grid-row: auto;
-}
-
-.autoRowAutoColumnSpanning2 {
-  background-color: maroon;
-  grid-column: span 2;
-  grid-row: auto;
-}
-
-.autoRowSpanning2AutoColumn {
-  background-color: aqua;
-  grid-column: auto;
-  grid-row: span 2;
-}
-
-.autoRowSpanning2AutoColumnSpanning3 {
-  background-color: olive;
-  grid-column: span 3;
-  grid-row: span 2;
-}
-
-.autoRowSpanning3AutoColumnSpanning2 {
-  background-color: indigo;
-  grid-column: span 2;
-  grid-row: span 3;
-}
-
-.autoRowFirstColumnSpanning2 {
-  background-color: maroon;
-  grid-column: 1 / span 2;
-  grid-row: auto;
-}
-
-.autoRowSecondColumnSpanning2 {
-  background-color: olive;
-  grid-column: 2 / span 2;
-  grid-row: auto;
-}
-
-.firstRowSpanning2AutoColumn {
-  background-color: maroon;
-  grid-column: auto;
-  grid-row: 1 / span 2;
-  height: 100%;
-}
-
-.secondRowSpanning2AutoColumn {
-  background-color: olive;
-  grid-column: auto;
-  grid-row: 2 / span 2;
-  height: 100%;
-}
-
-/* Grid element flow. */
-.gridAutoFlowColumnSparse {
-  grid-auto-flow: column;
-}
-
-.gridAutoFlowColumnDense {
-  grid-auto-flow: column dense;
-}
-
-.gridAutoFlowRowSparse {
-  grid-auto-flow: row;
-}
-
-.gridAutoFlowRowDense {
-  grid-auto-flow: row dense;
-}
-
-/* This rule makes sure the container is smaller than any grid items to avoid distributing any extra logical space to them. */
-.constrainedContainer {
-  width: 10px;
-  height: 10px;
-}
-
-.unconstrainedContainer {
-  width: 1000px;
-  height: 1000px;
-}
-
-.sizedToGridArea {
-  font: 10px/1 Ahem;
-  /* Make us fit our grid area. */
-  width: 100%;
-  height: 100%;
-}
-
-.verticalRL {
-  writing-mode: vertical-rl;
-}
-.verticalLR {
-  writing-mode: vertical-lr;
-}
-.horizontalTB {
-  writing-mode: horizontal-tb;
-}
-.directionRTL {
-  direction: rtl;
-}
-.directionLTR {
-  direction: ltr;
-}
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html
new file mode 100644
index 000000000000..cc6b3b50f984
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-baseline-align-cycles-001.html
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  CSS Grid Layout Test: Grid Item (First) Baseline Alignment Row Cyclic Sizing Exclusions
+</title>
+<meta name="assert" content="
+  A grid item whose size is input
+  to the size of the track
+  on which its size depends
+  cannot participate in baseline alignment.
+">
+<link rel="help" href="https://www.w3.org/TR/css-grid-1/#row-align">
+<link rel="match" href="references/grid-baseline-align-cycles-001-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .grid {
+    border: solid silver;
+    margin: 1em 0.25em;
+    display: inline-grid;
+    grid-template-columns: repeat(2, auto);
+    font: 20px/1 Ahem;
+    height: 5em;
+  }
+  .grid > div {
+    border: 1em aqua;
+    border-style: solid none;
+  }
+  .index {
+    padding: 1em 0;
+  }
+  .percent {
+    height: 20%;
+  }
+  .orthogonal {
+    writing-mode: vertical-rl;
+  }
+
+  .self > div {
+    align-self: baseline;
+  }
+  .content > div {
+    align-content: baseline;
+  }
+  .self.ref > div {
+    align-self: start;
+  }
+  .content.ref > div {
+    align-content: start;
+  }
+</style>
+
+<p>Test passes if the upper set of boxes is identical to the lower set.
+
+<div class="grid self">
+  <div class="index">
+    X
+  </div>
+  <div class="percent">
+    X
+  </div>
+</div>
+
+<div class="grid self">
+  <div class="index">
+    X
+  </div>
+  <div class="orthogonal">
+    X
+  </div>
+</div>
+
+<div class="grid content">
+  <div class="index">
+    X
+  </div>
+  <div class="percent">
+    X
+  </div>
+</div>
+
+<div class="grid content">
+  <div class="index">
+    X
+  </div>
+  <div class="orthogonal">
+    X
+  </div>
+</div>
+
+<br>
+
+<div class="grid self ref">
+  <div class="index">
+    X
+  </div>
+  <div class="percent">
+    X
+  </div>
+</div>
+
+<div class="grid self ref">
+  <div class="index">
+    X
+  </div>
+  <div class="orthogonal">
+    X
+  </div>
+</div>
+
+<div class="grid content ref">
+  <div class="index">
+    X
+  </div>
+  <div class="percent">
+    X
+  </div>
+</div>
+
+<div class="grid content ref">
+  <div class="index">
+    X
+  </div>
+  <div class="orthogonal">
+    X
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-001.html
index 673cda037dcd..e7bafab2e967 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-001.html
@@ -8,7 +8,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
 <link rel="help" href="https://drafts.csswg.org/css-align/#synthesize-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Grid items orthogonal to the Baseline Alignment Context should use their border-box 'under' edge as synthesized baseline.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-002.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-002.html
index 33e99ff65802..769ce1ea48b6 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-002.html
@@ -8,7 +8,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
 <link rel="help" href="https://drafts.csswg.org/css-align/#synthesize-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Empty grid items with fixed size should use their border-box 'under' edge as synthesized baseline.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-003.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-003.html
index 101363a45cd0..a68868e0385f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-003.html
@@ -8,7 +8,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
 <link rel="help" href="https://drafts.csswg.org/css-align/#synthesize-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Empty grid items with relative size should use their border-box 'under' edge as synthesized baseline.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-004.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-004.html
index da4d4f4fbcaf..f69fac5cef79 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-column-axis-self-baseline-synthesized-004.html
@@ -8,7 +8,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
 <link rel="help" href="https://drafts.csswg.org/css-align/#synthesize-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Grid items orthogonal to the Baseline Alignment Context should use their border-box 'under' edge as synthesized baseline.">
 <meta name="assert" content="Empty grid items with fixed size should use their border-box 'under' edge as synthesized baseline.">
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-001.html
index acbc473a3845..5f8c8e23c7c2 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-001.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#algo-overview">
 <meta name="flags" content="ahem dom">
 <meta name="assert" content="This test checks that content alignment is properly applied when the size of the tracks changes in the second pass of the track sizing algorithm.">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-002.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-002.html
index d06083188ced..c3f32c7efc7d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-content-alignment-second-pass-002.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#algo-overview">
 <meta name="flags" content="ahem dom">
 <meta name="assert" content="This test checks that content alignment is properly applied when the size of the tracks changes in the second pass of the track sizing algorithm.">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html
index 55a787546ba7..dff798cf5e01 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html
@@ -8,7 +8,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
 <link rel="help" href="https://drafts.csswg.org/css-align/#synthesize-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Grid items orthogonal to the Baseline Alignment Context should use their border-box 'under' edge as synthesized baseline.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html
index ccfac854971c..27e89c119dd2 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html
@@ -8,7 +8,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
 <link rel="help" href="https://drafts.csswg.org/css-align/#synthesize-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Empty grid items with fixed size should use their border-box 'under' edge as synthesized baseline.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html
index 76bcab2a9d46..3530084e88e7 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html
@@ -8,7 +8,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
 <link rel="help" href="https://drafts.csswg.org/css-align/#synthesize-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Empty grid items with relative size should use their border-box 'under' edge as synthesized baseline.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html
index 1ee19e439d83..4e49df779676 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html
@@ -8,7 +8,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
 <link rel="help" href="https://drafts.csswg.org/css-align/#synthesize-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Empty grid items with fixed size should use their border-box 'under' edge as synthesized baseline.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html
index 5b6f6ef31cdd..49d0a393508b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-001.html
@@ -9,7 +9,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-justify-items">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Grid items with relative size in the inline or block axis and an intrinsically-sized column or row respectively, don't participate in baseline alignment in the, row-like or column-like respectively, shared alignment context.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html
index 16edc3cad05f..8517771d9089 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html
@@ -9,7 +9,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-justify-items">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Grid items orthogonal to the Baseline Context along the inline or block axis and an intrinsically-sized column or row respectively, don't participate in baseline alignment in the, row-like or column-like respectively, shared alignment context.">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html
index da861d017e93..9122b5cbe948 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html
@@ -9,7 +9,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#propdef-justify-items">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#baseline-alignment">
 <link rel="help" href="https://drafts.csswg.org/css-align-3/#valdef-justify-self-baseline">
-<link rel="stylesheet" href="../../support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" href="../../support/alignment.css">
 <meta name="assert" content="Items not participating in baseline may later participate if there is an extra pass of the track sizing algorithm.">
 <!-- https://github.com/w3c/csswg-drafts/issues/3046 -->
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html
new file mode 100644
index 000000000000..ca1097e171e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/references/grid-baseline-align-cycles-001-ref.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  CSS Grid Layout Test: Grid Item (First) Baseline Alignment Row Cyclic Sizing Exclusions Reference File
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  .grid {
+    border: solid silver;
+    margin: 1em 0.25em;
+    display: inline-grid;
+    grid-template-columns: repeat(3, auto);
+    font: 20px/1 Ahem;
+    height: 5em;
+  }
+  .grid > div {
+    border: 1em aqua;
+    border-style: solid none;
+  }
+  .index {
+    padding: 1em 0;
+  }
+  .percent, .orthognal {
+    height: 1em;
+  }
+
+  .self > div {
+    align-self: start;
+  }
+  .content > div {
+    align-content: start;
+  }
+  .self.ref > div {
+    align-self: start;
+  }
+  .content.ref > div {
+    align-content: start;
+  }
+</style>
+
+<p>Test passes if the upper set of boxes is identical to the lower set.
+
+<div class="grid self">
+  <div class="index">
+    X
+  </div>
+  <div class="percent">
+    X
+  </div>
+</div>
+
+<div class="grid self">
+  <div class="index">
+    X
+  </div>
+  <div class="orthogonal">
+    X
+  </div>
+</div>
+
+<div class="grid content">
+  <div class="index">
+    X
+  </div>
+  <div class="percent">
+    X
+  </div>
+</div>
+
+<div class="grid content">
+  <div class="index">
+    X
+  </div>
+  <div class="orthogonal">
+    X
+  </div>
+</div>
+
+<br>
+
+<div class="grid self ref">
+  <div class="index">
+    X
+  </div>
+  <div class="percent">
+    X
+  </div>
+</div>
+
+<div class="grid self ref">
+  <div class="index">
+    X
+  </div>
+  <div class="orthogonal">
+    X
+  </div>
+</div>
+
+<div class="grid content ref">
+  <div class="index">
+    X
+  </div>
+  <div class="percent">
+    X
+  </div>
+</div>
+
+<div class="grid content ref">
+  <div class="index">
+    X
+  </div>
+  <div class="orthogonal">
+    X
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html
index cb843624377b..2786a986e062 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat">
 <meta name="assert" content="This test checks that auto repeat tracks use max size when size is indefinite to compute the number of tracks.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   position: relative;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html
index 0f8c860a2821..9fc0c983117a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat">
 <meta name="assert" content="This test checks that auto repeat tracks use percentage max size when size is indefinite to compute the number of tracks.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   position: relative;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html
index e9d1fded1ecc..7ff8b2ca2397 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-max-size-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat">
 <meta name="assert" content="This test checks that auto repeat tracks don't overflow the grid container size when max size is definite, even if min size is bigger than that.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   position: relative;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html
index 08d5ff82f299..cb29eed1537d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat">
 <meta name="assert" content="This test checks that auto repeat tracks use min size when available to compute the number of tracks.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   position: relative;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html
index 5fe4f33b51ca..4c73da777305 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-auto-repeat-min-size-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#auto-repeat">
 <meta name="assert" content="This test checks that auto repeat tracks use percentage min size when available to compute the number of tracks.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   position: relative;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html
index 33fcb248c26e..c2d17ec615f0 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-auto-repeat-tracks.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#repeat-notation" title="5.1.2 Repeating Rows and Columns: the 'repeat()' notation">
 <meta name="assert" content="This test checks that grid-template-{rows|columns} with auto-repeat tracks recomputes the positions of automatically placed grid items.">
 
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
 .grid {
   grid-auto-rows: 25px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html
index 905ad60ac846..c46722bc7dba 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-change-fit-content-argument-001.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#track-sizing">
 <meta name="assert" content="This test checks that grid-template-{rows|columns} with fit-content() tracks recomputes the tracks when the fit-content() argument is modified.">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html
index b06ffe5e43a8..deda5656679c 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-inline-auto-repeat-001.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Sergio Villar Senin" href="mailto:svillar@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#repeat-syntax">
 <meta name="assert" content="This test checks that we properly compute the number of required auto repeat tracks in indefinite sized containers with minimum sizes.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="support/testing-utils.js"></script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-001.html
index 383c804a07c8..40c642e1f32c 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-percentage-rows-indefinite-height-001.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#track-sizing">
 <meta name="assert" content="This test checks that percentage rows on grid containers with indefinite height are treated as 'auto' to compute the intrinsic height, but are later resolved against the intrinsic height during layout.">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html
index 36619d1430e2..f29a13e0fe06 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001-ref.html
@@ -3,7 +3,7 @@
 <meta charset="utf-8">
 <title>CSS Grid Layout Test: grid-template-columns fit-content() reference file</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html
index da31354e7953..83b53db39b15 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html
@@ -7,7 +7,7 @@
 <link rel="match" href="grid-template-columns-fit-content-001-ref.html">
 <meta name="assert" content="This test checks that 'fit-content()' works as expected in grid-template-columns, i.e., it's similar to 'auto' ('minmax(auto, max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater than the 'auto' minimum).">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html
index 23d74e9af978..bbadddc324f5 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001-ref.html
@@ -3,7 +3,7 @@
 <meta charset="utf-8">
 <title>CSS Grid Layout Test: grid-template-rows fit-content() reference file</title>
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <meta name="flags" content="ahem">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html
index a083330cb34c..f28aacb23bbd 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html
@@ -7,7 +7,7 @@
 <link rel="match" href="grid-template-rows-fit-content-001-ref.html">
 <meta name="assert" content="This test checks that 'fit-content()' works as expected in grid-template-rows, i.e., it's similar to 'auto' ('minmax(auto, max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater than the 'auto' minimum).">
 <meta name="flags" content="ahem">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/support/grid.css b/tests/wpt/web-platform-tests/css/css-grid/grid-definition/support/grid.css
deleted file mode 100644
index 78fdd5e975ad..000000000000
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-definition/support/grid.css
+++ /dev/null
@@ -1,283 +0,0 @@
-.grid {
-  display: grid;
-  background-color: grey;
-}
-
-.inline-grid {
-  display: inline-grid;
-  background-color: grey;
-}
-
-.firstRowFirstColumn {
-  background-color: blue;
-  grid-column: 1;
-  grid-row: 1;
-}
-
-.onlyFirstRowOnlyFirstColumn {
-  background-color: blue;
-  grid-column: 1 / 2;
-  grid-row: 1 / 2;
-}
-
-.firstRowSecondColumn {
-  background-color: lime;
-  grid-column: 2;
-  grid-row: 1;
-}
-
-.onlyFirstRowOnlySecondColumn {
-  background-color: lime;
-  grid-column: 2 / 3;
-  grid-row: 1 / 2;
-}
-
-.secondRowFirstColumn {
-  background-color: purple;
-  grid-column: 1;
-  grid-row: 2;
-}
-
-.onlySecondRowOnlyFirstColumn {
-  background-color: purple;
-  grid-column: 1 / 2;
-  grid-row: 2 / 3;
-}
-
-.secondRowSecondColumn {
-  background-color: orange;
-  grid-column: 2;
-  grid-row: 2;
-}
-
-.onlySecondRowOnlySecondColumn {
-  background-color: orange;
-  grid-column: 2 / 3;
-  grid-row: 2 / 3;
-}
-
-.endSecondRowEndSecondColumn {
-  background-color: orange;
-  grid-column-end: 3;
-  grid-row-end: 3;
-}
-
-.thirdRowSecondColumn {
-  background-color: red;
-  grid-column: 2;
-  grid-row: 3;
-}
-
-.thirdRowThirdColumn {
-  background-color: salmon;
-  grid-column: 3;
-  grid-row: 3;
-}
-
-.firstRowThirdColumn {
-  background-color: magenta;
-  grid-column: 3;
-  grid-row: 1;
-}
-
-.secondRowThirdColumn {
-  background-color: navy;
-  grid-column: 3;
-  grid-row: 2;
-}
-
-.firstRowFourthColumn {
-  background-color: green;
-  grid-column: 4;
-  grid-row: 1;
-}
-
-.secondRowFourthColumn {
-  background-color: pink;
-  grid-column: 4;
-  grid-row: 2;
-}
-
-.firstAutoRowSecondAutoColumn {
-  grid-row: 1 / auto;
-  grid-column: 2 / auto;
-}
-
-.autoLastRowAutoLastColumn {
-  grid-row: auto / -1;
-  grid-column: auto / -1;
-}
-
-.autoSecondRowAutoFirstColumn {
-  grid-row: auto / 2;
-  grid-column: auto / 1;
-}
-
-.firstRowBothColumn {
-  grid-row: 1;
-  grid-column: 1 / -1;
-}
-
-.secondRowBothColumn {
-  grid-row: 2;
-  grid-column: 1 / -1;
-}
-
-.bothRowFirstColumn {
-  grid-row: 1 / -1;
-  grid-column: 1;
-}
-
-.bothRowSecondColumn {
-  grid-row: 1 / -1;
-  grid-column: 2;
-}
-
-.bothRowBothColumn {
-  grid-row: 1 / -1;
-  grid-column: 1 / -1;
-}
-
-/* Auto column / row. */
-.autoRowAutoColumn {
-  background-color: pink;
-  grid-column: auto;
-  grid-row: auto;
-}
-
-.firstRowAutoColumn {
-  background-color: blue;
-  grid-column: auto;
-  grid-row: 1;
-}
-
-.secondRowAutoColumn {
-  background-color: purple;
-  grid-column: auto;
-  grid-row: 2;
-}
-
-.thirdRowAutoColumn {
-  background-color: navy;
-  grid-column: auto;
-  grid-row: 3;
-}
-
-.autoRowFirstColumn {
-  background-color: lime;
-  grid-column: 1;
-  grid-row: auto;
-}
-
-.autoRowSecondColumn {
-  background-color: orange;
-  grid-column: 2;
-  grid-row: auto;
-}
-
-.autoRowThirdColumn {
-  background-color: magenta;
-  grid-column: 3;
-  grid-row: auto;
-}
-
-.autoRowAutoColumnSpanning2 {
-  background-color: maroon;
-  grid-column: span 2;
-  grid-row: auto;
-}
-
-.autoRowSpanning2AutoColumn {
-  background-color: aqua;
-  grid-column: auto;
-  grid-row: span 2;
-}
-
-.autoRowSpanning2AutoColumnSpanning3 {
-  background-color: olive;
-  grid-column: span 3;
-  grid-row: span 2;
-}
-
-.autoRowSpanning3AutoColumnSpanning2 {
-  background-color: indigo;
-  grid-column: span 2;
-  grid-row: span 3;
-}
-
-.autoRowFirstColumnSpanning2 {
-  background-color: maroon;
-  grid-column: 1 / span 2;
-  grid-row: auto;
-}
-
-.autoRowSecondColumnSpanning2 {
-  background-color: olive;
-  grid-column: 2 / span 2;
-  grid-row: auto;
-}
-
-.firstRowSpanning2AutoColumn {
-  background-color: maroon;
-  grid-column: auto;
-  grid-row: 1 / span 2;
-  height: 100%;
-}
-
-.secondRowSpanning2AutoColumn {
-  background-color: olive;
-  grid-column: auto;
-  grid-row: 2 / span 2;
-  height: 100%;
-}
-
-/* Grid element flow. */
-.gridAutoFlowColumnSparse {
-  grid-auto-flow: column;
-}
-
-.gridAutoFlowColumnDense {
-  grid-auto-flow: column dense;
-}
-
-.gridAutoFlowRowSparse {
-  grid-auto-flow: row;
-}
-
-.gridAutoFlowRowDense {
-  grid-auto-flow: row dense;
-}
-
-/* This rule makes sure the container is smaller than any grid items to avoid distributing any extra logical space to them. */
-.constrainedContainer {
-  width: 10px;
-  height: 10px;
-}
-
-.unconstrainedContainer {
-  width: 1000px;
-  height: 1000px;
-}
-
-.sizedToGridArea {
-  font: 10px/1 Ahem;
-  /* Make us fit our grid area. */
-  width: 100%;
-  height: 100%;
-}
-
-.verticalRL {
-  writing-mode: vertical-rl;
-}
-.verticalLR {
-  writing-mode: vertical-lr;
-}
-.horizontalTB {
-  writing-mode: horizontal-tb;
-}
-.directionRTL {
-  direction: rtl;
-}
-.directionLTR {
-  direction: ltr;
-}
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-001.html
index 00487f766a7b..78bbfcbd2f64 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
 <meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with definite width.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-002.html
index c9f77a6ebe09..8458e8e0780a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
 <meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with indefinite width.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   display: inline-grid;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html
index 943837d2031c..33df23e6c0ab 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
 <meta name="assert" content="Checks that orthogonal grid items minimum width takes into account borders, padding and margins for grid containers with definite width.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html
index 25ad710d5d2f..ef2223256797 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-orthogonal-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
 <meta name="assert" content="Checks that orthogonal grid items minimum width takes into account borders, padding and margins for grid containers with indefinite width.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   display: inline-grid;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html
index 1afe6df95350..f137a7e47561 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
 <meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with definite width in vertical-lr.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html
index a239369e4d9e..9f2a5a2dae13 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-lr-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
 <meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with indefinite width in vertical-lr.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   display: inline-grid;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html
index df3fe9bca499..54a5a9187b8c 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
 <meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with definite width in vertical-rl.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html
index 3978ed607b7f..0640dbfaee57 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-minimum-width-vertical-rl-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
 <meta name="assert" content="Checks that grid items minimum width takes into account borders, padding and margins for grid containers with indefinite width in vertical-rl.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   display: inline-grid;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-001.html
index 8ef91b3fb87f..62fc14f4a97c 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved against the inline size of their grid area (in a fixed size track).">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-002.html
index e45530b2fd4a..19c75d7463f5 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved against the inline size of their grid area (in a track with fixed max sizing function and intrinsic min).">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-003.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-003.html
index 03d5d7f2c499..d6805b7b35b6 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-003.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-004.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-004.html
index 52e6f3bf1a68..009d655832b7 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-004.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-005.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-005.html
index 9cff92d1aa0c..4b86153e1b51 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-005.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-005.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-006.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-006.html
index 04d30e3edfc9..290f3fd7814d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-006.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-006.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-007.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-007.html
index 2906fe060870..78958e01708f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-007.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-007.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-008.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-008.html
index 7bd2e0fc5f4f..49a42722c059 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-008.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-008.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-009.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-009.html
index 70a6c231dc91..5fed639ef9c9 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-009.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-009.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-010.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-010.html
index 34352f60020e..5d6995f6906e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-010.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-010.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-011.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-011.html
index 36bd208df007..f2a87e1fb81c 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-011.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-011.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-012.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-012.html
index 9cdc15337a93..1071cdce5f9a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-012.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-012.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-013.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-013.html
index 581415b828e6..cb3b56725b84 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-013.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-013.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-014.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-014.html
index 5766e60339a0..32a171dc9efe 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-014.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-014.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-001.html
index aa0ff9698587..81e096531be4 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved against the inline size of their grid area (in a fixed size track) in a vertical-lr grid container.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-002.html
index 2f7724c04e43..5d9584d28a84 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-lr-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved against the inline size of their grid area (in a track with fixed max sizing function and intrinsic min) in a vertical-lr grid container.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-001.html
index efac5c6aa280..f0b493868397 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved against the inline size of their grid area (in a fixed size track) in a vertical-rl grid container.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-002.html
index 6da1d723a753..142b2fd2bb69 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-margins-vertical-rl-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage margins are resolved against the inline size of their grid area (in a track with fixed max sizing function and intrinsic min) in a vertical-rl grid container.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-001.html
index bf083d3ff7cc..892f8f90bcf3 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved against the inline size of their grid area (in a fixed size track).">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-002.html
index 3175469fb083..798cdbdbefb9 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved against the inline size of their grid area (in a track with fixed max sizing function and intrinsic min).">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-003.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-003.html
index d85a6c1abcfa..970f83c1edcc 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-003.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-004.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-004.html
index 26302daf2d60..60b08630df98 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-004.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-005.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-005.html
index 151b604f9bb7..6c67080f7a9a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-005.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-005.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-006.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-006.html
index bcbc7ced73a7..b17a5690241a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-006.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-006.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-007.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-007.html
index d4cf80c18df0..a49956390dde 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-007.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-007.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-008.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-008.html
index 38f766b5cfff..da9328bebc28 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-008.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-008.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-009.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-009.html
index eb1d1f47f28c..5d86919be298 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-009.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-009.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-010.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-010.html
index ecd430c68d41..18c8a9b7c81d 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-010.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-010.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-011.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-011.html
index e394ced4e6e5..a6aaed5ddf06 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-011.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-011.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-012.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-012.html
index 07b2d27b5817..771a1c8fef11 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-012.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-012.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-013.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-013.html
index 9b6c2bfe0ad2..5e6ff096469e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-013.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-013.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-014.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-014.html
index 9e67960913a2..2a9bd67ec4e9 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-014.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-014.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved correctly in a 'auto' sized grid area after changing the item's width and forcing a new layout.">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .container {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-001.html
index 6ad624a0a262..74997fd8b121 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved against the inline size of their grid area (in a fixed size track) in a vertical-lr grid container.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-002.html
index 9a3f3f13ddc8..edffee26fd02 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-lr-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved against the inline size of their grid area (in a track with fixed max sizing function and intrinsic min) in a vertical-lr grid container.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-001.html
index 49459a708948..92f943874d8a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved against the inline size of their grid area (in a fixed size track) in a vertical-rl grid container.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-002.html
index 3fa9766b2a7e..d3e062eaf8d5 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-percentage-paddings-vertical-rl-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid-1/#item-margins">
 <meta name="assert" content="Checks grid items percentage paddings are resolved against the inline size of their grid area (in a track with fixed max sizing function and intrinsic min) in a vertical-rl grid container.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-001.html
index cb5e8ee23b66..1c5c94cbc982 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-001.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
 <meta name="assert" content="Checks that relative offests work for grid items.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   position: relative;
@@ -92,4 +92,3 @@ <h3>Direction RTL</h3>
   <div class="thirdRowThirdColumn" style="right: 21px; bottom: 30px;"
     data-offset-x="99" data-offest-y="120" data-expected-width="30" data-expected-height="100"></div>
 </div>
-
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-002.html
index d92fca3ebb06..86a8f1af761e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-items-relative-offsets-002.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-item-sizing">
 <meta name="assert" content="Checks that relative percentage offests work for grid items.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <style>
 .grid {
   position: relative;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html
index 577d2baed284..350bce5947af 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-022.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items">
 <meta name="assert" content="Checks that automatic minimum size is clamped with different column sizes.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html
index 972b6e7afed0..0f91381bb30c 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-023.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items">
 <meta name="assert" content="Checks that automatic minimum size is clamped with different row sizes.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html
index e6acf16d35cb..74063286a644 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-024.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items">
 <meta name="assert" content="Checks that automatic minimum size is clamped with different column sizes and spaning items.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html
index 3608eb50c7ad..7b8c956d17c4 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/grid-minimum-size-grid-items-025.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.5. Implied Minimum Size of Grid Items">
 <meta name="assert" content="Checks that automatic minimum size is clamped with different row sizes and spaning items.">
-<link rel="stylesheet" href="support/grid.css">
+<link rel="stylesheet" href="/css/support/grid.css">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/grid.css b/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/grid.css
deleted file mode 100644
index 78fdd5e975ad..000000000000
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-items/support/grid.css
+++ /dev/null
@@ -1,283 +0,0 @@
-.grid {
-  display: grid;
-  background-color: grey;
-}
-
-.inline-grid {
-  display: inline-grid;
-  background-color: grey;
-}
-
-.firstRowFirstColumn {
-  background-color: blue;
-  grid-column: 1;
-  grid-row: 1;
-}
-
-.onlyFirstRowOnlyFirstColumn {
-  background-color: blue;
-  grid-column: 1 / 2;
-  grid-row: 1 / 2;
-}
-
-.firstRowSecondColumn {
-  background-color: lime;
-  grid-column: 2;
-  grid-row: 1;
-}
-
-.onlyFirstRowOnlySecondColumn {
-  background-color: lime;
-  grid-column: 2 / 3;
-  grid-row: 1 / 2;
-}
-
-.secondRowFirstColumn {
-  background-color: purple;
-  grid-column: 1;
-  grid-row: 2;
-}
-
-.onlySecondRowOnlyFirstColumn {
-  background-color: purple;
-  grid-column: 1 / 2;
-  grid-row: 2 / 3;
-}
-
-.secondRowSecondColumn {
-  background-color: orange;
-  grid-column: 2;
-  grid-row: 2;
-}
-
-.onlySecondRowOnlySecondColumn {
-  background-color: orange;
-  grid-column: 2 / 3;
-  grid-row: 2 / 3;
-}
-
-.endSecondRowEndSecondColumn {
-  background-color: orange;
-  grid-column-end: 3;
-  grid-row-end: 3;
-}
-
-.thirdRowSecondColumn {
-  background-color: red;
-  grid-column: 2;
-  grid-row: 3;
-}
-
-.thirdRowThirdColumn {
-  background-color: salmon;
-  grid-column: 3;
-  grid-row: 3;
-}
-
-.firstRowThirdColumn {
-  background-color: magenta;
-  grid-column: 3;
-  grid-row: 1;
-}
-
-.secondRowThirdColumn {
-  background-color: navy;
-  grid-column: 3;
-  grid-row: 2;
-}
-
-.firstRowFourthColumn {
-  background-color: green;
-  grid-column: 4;
-  grid-row: 1;
-}
-
-.secondRowFourthColumn {
-  background-color: pink;
-  grid-column: 4;
-  grid-row: 2;
-}
-
-.firstAutoRowSecondAutoColumn {
-  grid-row: 1 / auto;
-  grid-column: 2 / auto;
-}
-
-.autoLastRowAutoLastColumn {
-  grid-row: auto / -1;
-  grid-column: auto / -1;
-}
-
-.autoSecondRowAutoFirstColumn {
-  grid-row: auto / 2;
-  grid-column: auto / 1;
-}
-
-.firstRowBothColumn {
-  grid-row: 1;
-  grid-column: 1 / -1;
-}
-
-.secondRowBothColumn {
-  grid-row: 2;
-  grid-column: 1 / -1;
-}
-
-.bothRowFirstColumn {
-  grid-row: 1 / -1;
-  grid-column: 1;
-}
-
-.bothRowSecondColumn {
-  grid-row: 1 / -1;
-  grid-column: 2;
-}
-
-.bothRowBothColumn {
-  grid-row: 1 / -1;
-  grid-column: 1 / -1;
-}
-
-/* Auto column / row. */
-.autoRowAutoColumn {
-  background-color: pink;
-  grid-column: auto;
-  grid-row: auto;
-}
-
-.firstRowAutoColumn {
-  background-color: blue;
-  grid-column: auto;
-  grid-row: 1;
-}
-
-.secondRowAutoColumn {
-  background-color: purple;
-  grid-column: auto;
-  grid-row: 2;
-}
-
-.thirdRowAutoColumn {
-  background-color: navy;
-  grid-column: auto;
-  grid-row: 3;
-}
-
-.autoRowFirstColumn {
-  background-color: lime;
-  grid-column: 1;
-  grid-row: auto;
-}
-
-.autoRowSecondColumn {
-  background-color: orange;
-  grid-column: 2;
-  grid-row: auto;
-}
-
-.autoRowThirdColumn {
-  background-color: magenta;
-  grid-column: 3;
-  grid-row: auto;
-}
-
-.autoRowAutoColumnSpanning2 {
-  background-color: maroon;
-  grid-column: span 2;
-  grid-row: auto;
-}
-
-.autoRowSpanning2AutoColumn {
-  background-color: aqua;
-  grid-column: auto;
-  grid-row: span 2;
-}
-
-.autoRowSpanning2AutoColumnSpanning3 {
-  background-color: olive;
-  grid-column: span 3;
-  grid-row: span 2;
-}
-
-.autoRowSpanning3AutoColumnSpanning2 {
-  background-color: indigo;
-  grid-column: span 2;
-  grid-row: span 3;
-}
-
-.autoRowFirstColumnSpanning2 {
-  background-color: maroon;
-  grid-column: 1 / span 2;
-  grid-row: auto;
-}
-
-.autoRowSecondColumnSpanning2 {
-  background-color: olive;
-  grid-column: 2 / span 2;
-  grid-row: auto;
-}
-
-.firstRowSpanning2AutoColumn {
-  background-color: maroon;
-  grid-column: auto;
-  grid-row: 1 / span 2;
-  height: 100%;
-}
-
-.secondRowSpanning2AutoColumn {
-  background-color: olive;
-  grid-column: auto;
-  grid-row: 2 / span 2;
-  height: 100%;
-}
-
-/* Grid element flow. */
-.gridAutoFlowColumnSparse {
-  grid-auto-flow: column;
-}
-
-.gridAutoFlowColumnDense {
-  grid-auto-flow: column dense;
-}
-
-.gridAutoFlowRowSparse {
-  grid-auto-flow: row;
-}
-
-.gridAutoFlowRowDense {
-  grid-auto-flow: row dense;
-}
-
-/* This rule makes sure the container is smaller than any grid items to avoid distributing any extra logical space to them. */
-.constrainedContainer {
-  width: 10px;
-  height: 10px;
-}
-
-.unconstrainedContainer {
-  width: 1000px;
-  height: 1000px;
-}
-
-.sizedToGridArea {
-  font: 10px/1 Ahem;
-  /* Make us fit our grid area. */
-  width: 100%;
-  height: 100%;
-}
-
-.verticalRL {
-  writing-mode: vertical-rl;
-}
-.verticalLR {
-  writing-mode: vertical-lr;
-}
-.horizontalTB {
-  writing-mode: horizontal-tb;
-}
-.directionRTL {
-  direction: rtl;
-}
-.directionLTR {
-  direction: ltr;
-}
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html
index f1b8567f34ea..398073605689 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#propdef-overflow">
 <link rel="match" href="reference/100x100-grey-box.html">
 <meta name="assert" content="This test verifies that the scrollbars are not shown on an empty grid even if there are grid areas which exceed the grid container size, since the grid itself is not a box that can cause overflow.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
     .grid {
        grid: 200px / 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html
index dee656adcdcb..04f68feb1ad6 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#propdef-overflow">
 <link rel="match" href="reference/100x100-grey-box.html">
 <meta name="assert" content="This test verifies that the scrollbars are not shown on a grid with an item placed inside the boundaries of the grid container, even if there are grid areas which exceed the grid container size.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
     .grid {
        grid: 200px / 200px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html
index 3d13eab22b8a..1454bcbed34b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#propdef-overflow">
 <link rel="match" href="reference/100x100-grey-box.html">
 <meta name="assert" content="This test verifies that the scrollbars are not shown on a grid with an item placed inside the boundaries of the grid container, even if there are grid areas which exceed the grid container size.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
     .grid {
        grid: 100px 100px / 100px 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-004.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-004.html
index c4cd8b995dad..357bb5dd742f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-004.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-004.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#propdef-overflow">
 <link rel="match" href="reference/100x100-grey-box-with-horizontal-scrollbar.html">
 <meta name="assert" content="This test verifies that the horizontal scrollbar is shown on a grid with an item placed below the bottom of the grid container.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
     .grid {
        grid: 100px 100px / 100px 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-005.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-005.html
index afbde5696020..226544547a16 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-005.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-005.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#propdef-overflow">
 <link rel="match" href="reference/100x100-grey-box-with-vertical-scrollbar.html">
 <meta name="assert" content="This test verifies that the vertical scrollbar is shown on a grid with an item placed behind the right edge of the grid container.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
     .grid {
        grid: 100px 100px / 100px 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-006.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-006.html
index 4c689acb6010..6f1546f3fd0e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-006.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-006.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#propdef-overflow">
 <link rel="match" href="reference/100x100-grey-box-with-scrollbars.html">
 <meta name="assert" content="This test verifies that the scrollbars are shown on a grid with an item placed outside the boundaries of the grid container.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
     .grid {
        grid: 100px 100px / 100px 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-007.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-007.html
index 96faa81db3d5..0a7d3aa28a5a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-007.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-007.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#propdef-overflow">
 <link rel="match" href="reference/100x100-grey-box.html">
 <meta name="assert" content="This test verifies that the scrollbars are not shown on a grid with an item with 0px width even when it's placed in a grid area outside the boundaries of the grid container.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
     .grid {
        grid: 100px 100px / 100px 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-008.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-008.html
index baab7ca34fc9..df39ed8262fd 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-008.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-008.html
@@ -6,7 +6,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#propdef-overflow">
 <link rel="match" href="reference/100x100-grey-box.html">
 <meta name="assert" content="This test verifies that the scrollbars are not shown on a grid with an item with 0px height even when it's placed in a grid area outside the boundaries of the grid container.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
     .grid {
        grid: 100px 100px / 100px 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html
index b8e344ef7776..8e322fe38e11 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-letter-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#grid-containers">
 <link rel="help" href="http://www.w3.org/TR/css3-selectors/#first-letter">
 <meta name="assert" content="The test checks that grid item should ignore grid container's first-letter pseudo-element.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
   body { line-height: 20px; }
   .grid-first-letter::first-letter { line-height: 100px; color: red; }
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html
index 140d7bf11511..b19eee76a9fb 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-ignores-first-line-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#grid-containers">
 <link rel="help" href="http://www.w3.org/TR/css3-selectors/#first-formatted-line">
 <meta name="assert" content="The test checks that grid item should ignore grid container's first-line pseudo-element.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
   body { line-height: 20px; }
   .grid-first-line::first-line { line-height: 100px; }
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001.html
index 80a8cd117e71..848ed7d9090b 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-model">
 <link rel="match" href="grid-container-scrollbar-001-ref.html">
 <meta name="assert" content="This test verifies that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html
index cb1cfdc06a3b..aed5d0cf492a 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-model">
 <link rel="match" href="grid-container-scrollbar-vertical-lr-001-ref.html">
 <meta name="assert" content="This test verifies that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html
index 03144ae0da7e..e07223df2ae5 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-model">
 <link rel="match" href="grid-container-scrollbar-vertical-rl-001-ref.html">
 <meta name="assert" content="This test verifies that scrollbars are properly painted on grid containers, and are shown in the expected position depending on the direction.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   .grid {
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html
index b6914eb536ea..32206794c345 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-letter-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#grid-containers">
 <link rel="help" href="http://www.w3.org/TR/css3-selectors/#first-letter">
 <meta name="assert" content="The test checks that grid items accept first-letter pseudo-element.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
   .item::first-letter { line-height: 100px; }
 </style>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html
index 8bf8c653bf79..a6c8d2df451f 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-item-accepts-first-line-001.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#grid-containers">
 <link rel="help" href="http://www.w3.org/TR/css3-selectors/#first-formatted-line">
 <meta name="assert" content="The test checks that grid items accept first-line pseudo-element.">
-<link href="support/grid.css" rel="stylesheet">
+<link href="/css/support/grid.css" rel="stylesheet">
 <style>
   .item::first-line { line-height: 100px; }
 </style>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/support/grid.css b/tests/wpt/web-platform-tests/css/css-grid/grid-model/support/grid.css
deleted file mode 100644
index 78fdd5e975ad..000000000000
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/support/grid.css
+++ /dev/null
@@ -1,283 +0,0 @@
-.grid {
-  display: grid;
-  background-color: grey;
-}
-
-.inline-grid {
-  display: inline-grid;
-  background-color: grey;
-}
-
-.firstRowFirstColumn {
-  background-color: blue;
-  grid-column: 1;
-  grid-row: 1;
-}
-
-.onlyFirstRowOnlyFirstColumn {
-  background-color: blue;
-  grid-column: 1 / 2;
-  grid-row: 1 / 2;
-}
-
-.firstRowSecondColumn {
-  background-color: lime;
-  grid-column: 2;
-  grid-row: 1;
-}
-
-.onlyFirstRowOnlySecondColumn {
-  background-color: lime;
-  grid-column: 2 / 3;
-  grid-row: 1 / 2;
-}
-
-.secondRowFirstColumn {
-  background-color: purple;
-  grid-column: 1;
-  grid-row: 2;
-}
-
-.onlySecondRowOnlyFirstColumn {
-  background-color: purple;
-  grid-column: 1 / 2;
-  grid-row: 2 / 3;
-}
-
-.secondRowSecondColumn {
-  background-color: orange;
-  grid-column: 2;
-  grid-row: 2;
-}
-
-.onlySecondRowOnlySecondColumn {
-  background-color: orange;
-  grid-column: 2 / 3;
-  grid-row: 2 / 3;
-}
-
-.endSecondRowEndSecondColumn {
-  background-color: orange;
-  grid-column-end: 3;
-  grid-row-end: 3;
-}
-
-.thirdRowSecondColumn {
-  background-color: red;
-  grid-column: 2;
-  grid-row: 3;
-}
-
-.thirdRowThirdColumn {
-  background-color: salmon;
-  grid-column: 3;
-  grid-row: 3;
-}
-
-.firstRowThirdColumn {
-  background-color: magenta;
-  grid-column: 3;
-  grid-row: 1;
-}
-
-.secondRowThirdColumn {
-  background-color: navy;
-  grid-column: 3;
-  grid-row: 2;
-}
-
-.firstRowFourthColumn {
-  background-color: green;
-  grid-column: 4;
-  grid-row: 1;
-}
-
-.secondRowFourthColumn {
-  background-color: pink;
-  grid-column: 4;
-  grid-row: 2;
-}
-
-.firstAutoRowSecondAutoColumn {
-  grid-row: 1 / auto;
-  grid-column: 2 / auto;
-}
-
-.autoLastRowAutoLastColumn {
-  grid-row: auto / -1;
-  grid-column: auto / -1;
-}
-
-.autoSecondRowAutoFirstColumn {
-  grid-row: auto / 2;
-  grid-column: auto / 1;
-}
-
-.firstRowBothColumn {
-  grid-row: 1;
-  grid-column: 1 / -1;
-}
-
-.secondRowBothColumn {
-  grid-row: 2;
-  grid-column: 1 / -1;
-}
-
-.bothRowFirstColumn {
-  grid-row: 1 / -1;
-  grid-column: 1;
-}
-
-.bothRowSecondColumn {
-  grid-row: 1 / -1;
-  grid-column: 2;
-}
-
-.bothRowBothColumn {
-  grid-row: 1 / -1;
-  grid-column: 1 / -1;
-}
-
-/* Auto column / row. */
-.autoRowAutoColumn {
-  background-color: pink;
-  grid-column: auto;
-  grid-row: auto;
-}
-
-.firstRowAutoColumn {
-  background-color: blue;
-  grid-column: auto;
-  grid-row: 1;
-}
-
-.secondRowAutoColumn {
-  background-color: purple;
-  grid-column: auto;
-  grid-row: 2;
-}
-
-.thirdRowAutoColumn {
-  background-color: navy;
-  grid-column: auto;
-  grid-row: 3;
-}
-
-.autoRowFirstColumn {
-  background-color: lime;
-  grid-column: 1;
-  grid-row: auto;
-}
-
-.autoRowSecondColumn {
-  background-color: orange;
-  grid-column: 2;
-  grid-row: auto;
-}
-
-.autoRowThirdColumn {
-  background-color: magenta;
-  grid-column: 3;
-  grid-row: auto;
-}
-
-.autoRowAutoColumnSpanning2 {
-  background-color: maroon;
-  grid-column: span 2;
-  grid-row: auto;
-}
-
-.autoRowSpanning2AutoColumn {
-  background-color: aqua;
-  grid-column: auto;
-  grid-row: span 2;
-}
-
-.autoRowSpanning2AutoColumnSpanning3 {
-  background-color: olive;
-  grid-column: span 3;
-  grid-row: span 2;
-}
-
-.autoRowSpanning3AutoColumnSpanning2 {
-  background-color: indigo;
-  grid-column: span 2;
-  grid-row: span 3;
-}
-
-.autoRowFirstColumnSpanning2 {
-  background-color: maroon;
-  grid-column: 1 / span 2;
-  grid-row: auto;
-}
-
-.autoRowSecondColumnSpanning2 {
-  background-color: olive;
-  grid-column: 2 / span 2;
-  grid-row: auto;
-}
-
-.firstRowSpanning2AutoColumn {
-  background-color: maroon;
-  grid-column: auto;
-  grid-row: 1 / span 2;
-  height: 100%;
-}
-
-.secondRowSpanning2AutoColumn {
-  background-color: olive;
-  grid-column: auto;
-  grid-row: 2 / span 2;
-  height: 100%;
-}
-
-/* Grid element flow. */
-.gridAutoFlowColumnSparse {
-  grid-auto-flow: column;
-}
-
-.gridAutoFlowColumnDense {
-  grid-auto-flow: column dense;
-}
-
-.gridAutoFlowRowSparse {
-  grid-auto-flow: row;
-}
-
-.gridAutoFlowRowDense {
-  grid-auto-flow: row dense;
-}
-
-/* This rule makes sure the container is smaller than any grid items to avoid distributing any extra logical space to them. */
-.constrainedContainer {
-  width: 10px;
-  height: 10px;
-}
-
-.unconstrainedContainer {
-  width: 1000px;
-  height: 1000px;
-}
-
-.sizedToGridArea {
-  font: 10px/1 Ahem;
-  /* Make us fit our grid area. */
-  width: 100%;
-  height: 100%;
-}
-
-.verticalRL {
-  writing-mode: vertical-rl;
-}
-.verticalLR {
-  writing-mode: vertical-lr;
-}
-.horizontalTB {
-  writing-mode: horizontal-tb;
-}
-.directionRTL {
-  direction: rtl;
-}
-.directionLTR {
-  direction: ltr;
-}
diff --git a/tests/wpt/web-platform-tests/css/css-logical/animation-001.html b/tests/wpt/web-platform-tests/css/css-logical/animation-001.html
index 8135f43275bb..71542022c979 100644
--- a/tests/wpt/web-platform-tests/css/css-logical/animation-001.html
+++ b/tests/wpt/web-platform-tests/css/css-logical/animation-001.html
@@ -299,6 +299,18 @@
   assert_equals(getComputedStyle(div).marginRight, '50px');
 }, 'Animations update when the direction is changed');
 
+test(t => {
+  const div = addDiv(t);
+  const anim = div.animate(
+    {
+      insetBlock: ['var(--200px)', 'var(--300px)'],
+    },
+    1000
+  );
+  anim.currentTime = 500;
+  assert_equals(getComputedStyle(div).insetBlockStart, '250px');
+}, 'Logical shorthand with variable references animates correctly');
+
 test(t => {
   const div = addDiv(t);
   const anim = div.animate(
diff --git a/tests/wpt/web-platform-tests/css/css-logical/animation-002.html b/tests/wpt/web-platform-tests/css/css-logical/animation-002.html
index d4f199d50e48..9213a05d83da 100644
--- a/tests/wpt/web-platform-tests/css/css-logical/animation-002.html
+++ b/tests/wpt/web-platform-tests/css/css-logical/animation-002.html
@@ -196,6 +196,19 @@
   assert_equals(getComputedStyle(div).height, '0px');
 }, 'Animations update when the writing-mode is changed through a CSS variable');
 
+test(t => {
+  addStyle(t, { ':root': '--200px: 200px; --300px: 300px' });
+  addStyle(t, {
+    '@keyframes anim': 'from { inset-block: var(--200px) } to { inset-block: var(--300px) }',
+  });
+  const div = addDiv(t, {
+    style:
+      'animation: anim 10s -5s paused linear;'
+      + ' width: 0px; height: 0px;'
+  });
+  assert_equals(getComputedStyle(div).insetBlockStart, '250px');
+}, 'Logical shorthand with variable references animates correctly');
+
 test(t => {
   addStyle(t, {
     '@keyframes anim':
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-recursion-002.svg b/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-recursion-002.svg
index ae10c06afc40..7d921ee67d44 100644
--- a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-recursion-002.svg
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/clip-path-recursion-002.svg
@@ -5,10 +5,11 @@
 	<html:link rel="author" title="Dirk Schulze" href="mailto:dschulze@adobe.com"/>
 	<html:link rel="help" href="http://www.w3.org/TR/css-masking-1/#svg-clipping-paths"/>
 	<html:link rel="help" href="http://www.w3.org/TR/css-masking-1/#ClipPathElement"/>
-	<html:link rel="match" href="reference/clip-path-invisible-ref.svg" />
+	<html:link rel="match" href="reference/clip-path-recursion-002-ref.svg" />
 	<metadata class="flags">svg</metadata>
-	<desc class="assert">A clipPath recursion counts as invalid clipping
-	path and makes the element disappear. You should see nothing.</desc>
+  <desc class="assert">
+    A clipPath recursion counts as invalid clipping path.
+  </desc>
 </g>
 <defs>
 	<rect x="50" y="150" width="50" height="50" id="rect" fill="none" clip-path="url(#clipPath_1)"/>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg b/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg
new file mode 100644
index 000000000000..6eb3cb155caf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path-svg-content/reference/clip-path-recursion-002-ref.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:html="http://www.w3.org/1999/xhtml"
+	 xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect x="50" width="50" height="50" fill="red" />
+<rect x="50" y="150" width="50" height="50" fill="red"/>
+</svg>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate-ref.html b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate-ref.html
new file mode 100644
index 000000000000..20c8085b948f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate-ref.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html>
+<title>Clip Path: invalidate composited clip-path via SVG</title>
+<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
+
+<style>
+  body {
+    margin: 0;
+  }
+  div {
+    height: 500px;
+    background: black;
+    clip-path: url(#clip);
+    will-change: transform;
+  }
+  svg {
+    width: 0;
+    height: 0;
+  }
+</style>
+
+<div></div>
+
+<svg viewBox="0 0 1 1">
+  <clipPath id="clip" clipPathUnits="objectBoundingBox">
+    <polygon points="0,0 0.5,1 1,0" />
+  </clipPath>
+</svg>
diff --git a/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate.html b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate.html
new file mode 100644
index 000000000000..0bf921c7cf12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-masking/clip-path/clip-path-svg-invalidate.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<html class="reftest-wait">
+<title>Clip Path: invalidate composited clip-path via SVG</title>
+<link rel="author" title="Chris Harrelson" href="mailto:chrishtr@chromium.org">
+<link rel="help" href="http://www.w3.org/TR/css-masking-1/#clipping-paths">
+<link rel="help" href="http://www.w3.org/TR/css-masking-1/#the-clip-path">
+<link rel="match" href="clip-path-svg-invalidate-ref.html">
+<script src="/common/reftest-wait.js"></script>
+
+<style>
+  body {
+    margin: 0;
+  }
+  div {
+    height: 500px;
+    background: black;
+    clip-path: url(#clip);
+    will-change: transform;
+  }
+  svg {
+    width: 0;
+    height: 0;
+  }
+</style>
+
+<div></div>
+
+<svg viewBox="0 0 1 1">
+  <clipPath id="clip" clipPathUnits="objectBoundingBox">
+    <polygon points="0,0 0.5,0.5 1,0" />
+  </clipPath>
+</svg>
+
+<script>
+  const polygon = document.querySelector("polygon");
+  const points = "0,0 0.5,1 1,0";
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+      polygon.setAttribute("points", points);
+      takeScreenshot();
+  }));
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/hidpi/canvas-transform-ref.html b/tests/wpt/web-platform-tests/css/css-paint-api/hidpi/canvas-transform-ref.html
index 48d46e8e5610..d3e4e0913f6a 100644
--- a/tests/wpt/web-platform-tests/css/css-paint-api/hidpi/canvas-transform-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/hidpi/canvas-transform-ref.html
@@ -4,13 +4,14 @@
 <canvas id ="canvas" width="540" height="550"></canvas>
 <script>
 var canvas = document.getElementById('canvas');
-canvas.style.width = (canvas.width / devicePixelRatio) + 'px';
-canvas.style.height = (canvas.height / devicePixelRatio) + 'px';
+// In the test page, the paint worklet canvas has a size of width of 270 CSS
+// pixels, and height of 275. To divided by 2 is to match the canvas size.
+canvas.style.width = (canvas.width / 2) + 'px';
+canvas.style.height = (canvas.height / 2) + 'px';
 var ctx = canvas.getContext("2d");
-ctx.scale(devicePixelRatio, devicePixelRatio);
 var fillW = 250;
 var fillH = 50;
-ctx.setTransform(devicePixelRatio, 0, 0, devicePixelRatio, 0, 100);
+ctx.setTransform(2 * devicePixelRatio, 0, 0, 2 * devicePixelRatio, 0, 200);
 ctx.beginPath();
 ctx.rect(0, 0, fillW, fillH);
 ctx.closePath();
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/input/keyboard.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/input/keyboard.html
new file mode 100644
index 000000000000..47eade8b809e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/input/keyboard.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap-1" />
+<title>Arrow key scroll snapping</title>
+<meta name="flags" content="should">
+<meta name="assert"
+      content="Test passes if keyboard scrolling correctly snaps on a snap
+               container">
+
+<link rel="stylesheet" href="../support/common.css">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="../support/common.js"></script>
+
+
+<div id="scroller">
+  <div id="space"></div>
+  <div class="snap left top" id="top-left"></div>
+  <div class="snap right top" id="top-right"></div>
+  <div class="snap left bottom" id="bottom-left"></div>
+</div>
+
+<script>
+const scroller = document.getElementById("scroller");
+const topLeft = document.getElementById("top-left");
+const topRight = document.getElementById("top-right");
+
+scrollLeft = () => scroller.scrollLeft;
+scrollTop = () => scroller.scrollTop;
+
+promise_test(async t => {
+  scroller.scrollTo(0, 0);
+  assert_equals(scroller.scrollTop, 0, "verify test pre-condition");
+  await keyPress(scroller, "ArrowDown");
+  await waitForAnimationEnd(scrollTop);
+  assert_equals(scroller.scrollTop, 400);
+}, "Snaps to bottom-left after pressing ArrowDown");
+
+promise_test(async t => {
+  scroller.scrollTo(0, 400);
+  assert_equals(scroller.scrollTop, 400, "verify test pre-condition");
+  await keyPress(scroller, "ArrowUp");
+  await waitForAnimationEnd(scrollTop);
+  assert_equals(scroller.scrollTop, 0);
+}, "Snaps to top-left after pressing ArrowUp");
+
+promise_test(async t => {
+  scroller.scrollTo(0, 0);
+  assert_equals(scroller.scrollTop, 0, "verify test pre-condition");
+  await keyPress(scroller, "ArrowRight");
+  await waitForAnimationEnd(scrollLeft);
+  assert_equals(scroller.scrollLeft, 400);
+}, "Snaps to top-right after pressing ArrowRight");
+
+promise_test(async t => {
+  scroller.scrollTo(400, 0);
+  assert_equals(scroller.scrollLeft, 400, "verify test pre-condition");
+  await keyPress(scroller, "ArrowLeft");
+  await waitForAnimationEnd(scrollLeft);
+  assert_equals(scroller.scrollLeft, 0);
+}, "Snaps to top-left after pressing ArrowLeft");
+
+promise_test(async t => {
+  t.add_cleanup(function() {
+    topLeft.style.width = "";
+    topRight.style.left = "400px";
+  });
+
+  // Make the snap area cover the snapport.
+  topLeft.style.width = "800px";
+  // Make the distance between the previous and the next snap position larger
+  // than snapport.
+  topRight.style.left = "500px";
+  scroller.scrollTo(0, 0);
+  assert_equals(scroller.scrollLeft, 0, "verify test pre-condition");
+  await keyPress(scroller, "ArrowRight");
+  await waitForAnimationEnd(scrollLeft);
+  assert_between_exclusive(scroller.scrollLeft, 0, 500);
+}, "If the original intended offset is valid as making a snap area cover the"
++ "snapport, and there's no other snap offset in between, use the original"
++ "intended offset");
+
+promise_test(async t => {
+  t.add_cleanup(function() {
+    topLeft.style.width = "";
+    topRight.style.left = "400px";
+  });
+
+  // Make the snap area cover the snapport.
+  topLeft.style.width = "800px";
+  // Make the next snap offset closer than the original intended offset.
+  topRight.style.left = "20px";
+  scroller.scrollTo(0, 0);
+  assert_equals(scroller.scrollLeft, 0, "verify test pre-condition");
+  await keyPress(scroller, "ArrowRight");
+  await waitForAnimationEnd(scrollLeft);
+  assert_equals(scroller.scrollLeft, 20);
+}, "If the original intended offset is valid as making a snap area cover the "
++ "snapport, but there's a defined snap offset in between, use the defined snap"
++ " offset.");
+
+promise_test(async t => {
+  scroller.scrollTo(400, 0);
+  await keyPress(scroller, "ArrowRight");
+  await waitForAnimationEnd(scrollLeft);
+  assert_equals(scroller.scrollLeft, 400);
+}, "If there is no valid snap offset on the arrow key's direction other than "
++ "the current offset, and the scroll-snap-type is mandatory, stay at the "
++ "current offset.");
+
+promise_test(async t => {
+  t.add_cleanup(function() {
+    scroller.style.scrollSnapType = "both mandatory";
+  });
+
+  scroller.style.scrollSnapType = "both proximity";
+  scroller.scrollTo(400, 0);
+  assert_equals(scroller.scrollLeft, 400, "verify test pre-condition");
+  await keyPress(scroller, "ArrowRight");
+  await waitForAnimationEnd(scrollLeft);
+  assert_greater_than(scroller.scrollLeft, 400);
+}, "If there is no valid snap offset on the arrow key's direction other than "
++ "the current offset, and the scroll-snap-type is proximity, go to the "
++ "original intended offset");
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-capturing-remove-scroll-container.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-capturing-remove-scroll-container.html
index 0426c029eec2..9b8240715992 100644
--- a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-capturing-remove-scroll-container.html
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-capturing-remove-scroll-container.html
@@ -76,54 +76,54 @@
 // its snap areas to the next scrollable ancestor, per spec [1].
 // [1] https://drafts.csswg.org/css-scroll-snap/#captures-snap-positions
 test(() => {
-  const innerscroller = document.getElementById("inner-scroller");
-  const middlescroller = document.getElementById("middle-scroller");
-  const documentscroller = document.scrollingElement;
+  const inner_scroller = document.getElementById("inner-scroller");
+  const middle_scroller = document.getElementById("middle-scroller");
+  const document_scroller = document.scrollingElement;
 
   // Middle scroller doesn't snap.
   // Document scroller should snap to its only captured area.
-  documentscroller.scrollBy(0, 100);
-  middlescroller.scrollBy(0, 10);
-  assert_equals(innerscroller.scrollTop, 0);
-  assert_equals(middlescroller.scrollTop, 10);
-  assert_equals(documentscroller.scrollTop, 500);
+  document_scroller.scrollBy(0, 100);
+  middle_scroller.scrollBy(0, 10);
+  assert_equals(inner_scroller.scrollTop, 0);
+  assert_equals(middle_scroller.scrollTop, 10);
+  assert_equals(document_scroller.scrollTop, 500);
 
   // Inner scroller snaps.
-  innerscroller.scrollBy(0, 10);
-  assert_equals(innerscroller.scrollTop, 300);
-  assert_equals(middlescroller.scrollTop, 10);
-  assert_equals(documentscroller.scrollTop, 500);
+  inner_scroller.scrollBy(0, 10);
+  assert_equals(inner_scroller.scrollTop, 300);
+  assert_equals(middle_scroller.scrollTop, 10);
+  assert_equals(document_scroller.scrollTop, 500);
 
   // Inner scroller is no longer a scroll container.
-  innerscroller.style.setProperty("overflow", "visible");
-  assert_equals(innerscroller.scrollTop, 0);
-  assert_equals(middlescroller.scrollTop, 10);
-  assert_equals(documentscroller.scrollTop, 500);
+  inner_scroller.style.setProperty("overflow", "visible");
+  assert_equals(inner_scroller.scrollTop, 0);
+  assert_equals(middle_scroller.scrollTop, 10);
+  assert_equals(document_scroller.scrollTop, 500);
 
   // The new snap container is the middle scroller, which has snap-type 'none'.
   // Per spec, the scroll container should capture snap positions even if it has
   // snap-type 'none'.
   // The middle scroller should not snap.
   // The document scroller should still only snap to its captured snap area.
-  documentscroller.scrollBy(0, 100);
-  middlescroller.scrollBy(0, 10);
-  assert_equals(innerscroller.scrollTop, 0);
-  assert_equals(middlescroller.scrollTop, 20);
-  assert_equals(documentscroller.scrollTop, 500);
+  document_scroller.scrollBy(0, 100);
+  middle_scroller.scrollBy(0, 10);
+  assert_equals(inner_scroller.scrollTop, 0);
+  assert_equals(middle_scroller.scrollTop, 20);
+  assert_equals(document_scroller.scrollTop, 500);
 
   // The scroll container should now be at the document level.
-  middlescroller.style.setProperty("overflow", "visible");
-  documentscroller.scrollBy(0, -10);
-  assert_equals(innerscroller.scrollTop, 0);
-  assert_equals(middlescroller.scrollTop, 0);
+  middle_scroller.style.setProperty("overflow", "visible");
+  document_scroller.scrollBy(0, -10);
+  assert_equals(inner_scroller.scrollTop, 0);
+  assert_equals(middle_scroller.scrollTop, 0);
 
   // Check that the existing snap area did not get removed when reassigning
   // the inner snap area.
-  assert_equals(documentscroller.scrollTop, 500);
+  assert_equals(document_scroller.scrollTop, 500);
 
   // Check that the inner snap area got reassigned to the document.
-  documentscroller.scrollBy(0, 150);
-  assert_equals(documentscroller.scrollTop, 600);
+  document_scroller.scrollBy(0, 150);
+  assert_equals(document_scroller.scrollTop, 600);
 }, 'Making a snap container not scrollable should promote the next scrollable\
  ancestor to become a snap container.');
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-caputring-add-scroll-container.html b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-caputring-add-scroll-container.html
new file mode 100644
index 000000000000..d04536763920
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/snap-area-caputring-add-scroll-container.html
@@ -0,0 +1,149 @@
+<!DOCTYPE html>
+<title>
+  Adding a scrollable element should make it start capturing snap points.
+</title>
+<link rel="help" href="https://drafts.csswg.org/css-scroll-snap/#captures-snap-positions"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+div {
+  position: absolute;
+  margin: 0px;
+}
+
+html {
+  scroll-snap-type: y mandatory;
+}
+
+body {
+  margin: 0px;
+}
+
+#middle-scroller {
+  top: 100px;
+  height: 500px;
+  width: 500px;
+  overflow: visible;
+  background-color: rgb(12, 61, 2);
+  scroll-snap-type: none;
+}
+
+#inner-scroller {
+  top: 200px;
+  height: 400px;
+  width: 400px;
+  overflow: visible;
+  background-color: rgb(65, 139, 50);
+  scroll-snap-type: y mandatory;
+}
+
+.space {
+  width: 2000px;
+  height: 2000px;
+}
+
+#inner-snap-area {
+  top: 300px;
+  width: 200px;
+  height: 200px;
+  background-color: blue;
+  scroll-snap-align: start;
+}
+
+#document-snap-area {
+  top: 500px;
+  width: 200px;
+  height: 200px;
+  background-color: lightblue;
+  scroll-snap-align: start;
+}
+
+#inserted-snap-container {
+  top: 400px;
+  height: 600px;
+  width: 400px;
+  overflow: scroll;
+  scroll-snap-type: y mandatory;
+}
+</style>
+
+<div class="space"></div>
+  <div id="middle-scroller">
+    <div class="space"></div>
+    <div id="inner-scroller">
+        <div class="space"></div>
+        <div id="inner-snap-area"></div>
+    </div>
+  </div>
+</div>
+<div id="document-snap-area"></div>
+<script>
+
+const inner_scroller = document.getElementById("inner-scroller");
+const middle_scroller = document.getElementById("middle-scroller");
+const document_scroller = document.scrollingElement;
+
+// This tests that making an element scrollable will reassign the correct snap
+// areas to itself, per spec [1].
+// [1] https://drafts.csswg.org/css-scroll-snap/#captures-snap-positions
+test(() => {
+  // Confirm that the document-level scroller is the snap container for all of
+  // the snap areas.
+  document_scroller.scrollBy(0, 10);
+  assert_equals(document_scroller.scrollTop, 500);
+  // Snaps to the inner snap area.
+  document_scroller.scrollBy(0, 75);
+  assert_equals(document_scroller.scrollTop, 600);
+
+  // The middle scroller should now have the inner snap area assigned to it.
+  // Per spec, even if the snap-type is 'none', it should still capture snap
+  // points.
+  middle_scroller.style.setProperty("overflow", "scroll");
+
+  // The middle scroller has snap-type 'none' so it should not snap.
+  middle_scroller.scrollBy(0, 10);
+  assert_equals(middle_scroller.scrollTop, 10);
+
+  // The document scroller should only snap to the document-level snap area.
+  document_scroller.scrollTo(0, 600);
+  assert_equals(document_scroller.scrollTop, 500);
+
+  // The inner scroller should now have the innermost snap area assigned to it.
+  inner_scroller.style.setProperty("overflow", "scroll");
+  inner_scroller.scrollBy(0, 10);
+  assert_equals(inner_scroller.scrollTop, 300);
+
+  document_scroller.scrollTo(0, 600);
+  assert_equals(document_scroller.scrollTop, 500);
+
+}, "Making an element scrollable should make it capture the correct descendant\
+ snap areas' snap points.");
+
+ // Test that attaching a new snap container also properly assigns snap areas.
+ test(() => {
+  // Sanity check that the scrollers still snap to the snap areas.
+  document_scroller.scrollBy(0, 10);
+  inner_scroller.scrollBy(0,10);
+  assert_equals(inner_scroller.scrollTop, 300);
+  assert_equals(document_scroller.scrollTop, 500);
+
+  // Create new snap container and append thedocument-level snap area as its
+  // child.
+  const inserted_scroller = document.createElement("div");
+  inserted_scroller.id = "inserted-snap-container";
+  const space = document.createElement("div");
+  space.classList.add("space");
+  inserted_scroller.appendChild(space);
+  inserted_scroller.appendChild(document.getElementById("document-snap-area"));
+  document_scroller.appendChild(inserted_scroller);
+
+  // Document scroller no longer snaps.
+  document_scroller.scrollTo(0, 400);
+  assert_equals(document_scroller.scrollTop, 400);
+
+  // Inserted scroller snaps.
+  inserted_scroller.scrollBy(0, 10);
+  assert_equals(inserted_scroller.scrollTop, 500);
+ }, "Attaching a new element that is scrollable should assign the correct snap\
+ areas to it.");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.css b/tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.css
new file mode 100644
index 000000000000..f49c7cbacd5b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.css
@@ -0,0 +1,44 @@
+body {
+  margin: 0;
+}
+
+#scroller {
+  position: absolute;
+  width: 400px;
+  height: 400px;
+  overflow: scroll;
+  padding: 0;
+
+  scroll-snap-type: both mandatory;
+}
+
+.snap {
+  position: absolute;
+  width: 200px;
+  height: 200px;
+  background-color: blue;
+
+  scroll-snap-align: start;
+}
+
+#space {
+  position: absolute;
+  width: 1000px;
+  height: 1000px;
+}
+
+.left {
+  left: 0;
+}
+
+.top {
+  top: 0;
+}
+
+.right {
+  left: 400px;
+}
+
+.bottom {
+  top: 400px;
+}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.js b/tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.js
new file mode 100644
index 000000000000..65feec3b6b61
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/support/common.js
@@ -0,0 +1,64 @@
+const KEY_CODE_MAP = {
+  'ArrowLeft':  '\uE012',
+  'ArrowUp':    '\uE013',
+  'ArrowRight': '\uE014',
+  'ArrowDown':  '\uE015',
+  'PageUp':     '\uE00E',
+  'PageDown':   '\uE00F',
+  'End':        '\uE010',
+  'Home':       '\uE011',
+  'Space':      ' ',
+};
+
+// Send key event to the target element using test driver. Supports human
+// friendly key names for common keyboard scroll operations e.g., arrow keys,
+// page keys, etc.
+async function keyPress(target, key) {
+  let code = key;
+  if (KEY_CODE_MAP.hasOwnProperty(key))
+    code = KEY_CODE_MAP[key];
+
+  // First move pointer on target and click to ensure it receives the key.
+  let actions = new test_driver.Actions()
+    .pointerMove(0, 0, {origin: target})
+    .pointerDown()
+    .pointerUp()
+    .keyDown(code)
+    .keyUp(code);
+
+  return actions.send();
+}
+
+// Use rAF to wait for the value of the getter function passed to not change for
+// at least 15 frames or timeout after 1 second.
+//
+// Example usage:
+//    await waitForAnimationEnd(() => scroller.scrollTop);
+function waitForAnimationEnd(getValue) {
+  const TIMEOUT = 1000; // milliseconds
+  const MAX_UNCHANGED_FRAMES = 15;
+
+  const start_time = performance.now();
+  let last_changed_frame = 0;
+  let last_value = getValue();
+
+  return new Promise((resolve, reject) => {
+    function tick(frames, time) {
+    // We requestAnimationFrame either for TIMEOUT milliseconds or until
+    // MAX_UNCHANGED_FRAMES with no change have been observed.
+      if (time - start_time > TIMEOUT ||
+          frames - last_changed_frame >= MAX_UNCHANGED_FRAMES) {
+        resolve();
+      } else {
+        current_value = getValue();
+        if (last_value != current_value) {
+          last_changed_frame = frames;
+          last_value = current_value;
+        }
+        requestAnimationFrame(tick.bind(this, frames + 1));
+      }
+    }
+    tick(0, start_time);
+  });
+}
+
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/ortho-writing-mode-001.html b/tests/wpt/web-platform-tests/css/css-sizing/ortho-writing-mode-001.html
new file mode 100644
index 000000000000..9342802645fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/ortho-writing-mode-001.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="author" title="David Grogan" href="mailto:dgrogan@chromium.org">
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes" title="first paragraph">
+<link rel="help" href="https://www.w3.org/TR/css-writing-modes-4/#orthogonal-auto">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name="flags" content="" />
+<meta name="assert" content="The intrinsic size of an orthogonal child is its shrink to fit size after layout" />
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div style="width:min-content; background:red;">
+  <div style="writing-mode:vertical-rl; background:green;">
+    <div style="margin-right:50%; width:50px; height:100px;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/percentage-resolution-001-ref.html b/tests/wpt/web-platform-tests/css/css-sizing/percentage-resolution-001-ref.html
new file mode 100644
index 000000000000..a4e7f1ece467
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/percentage-resolution-001-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Sizing: Test that percentages don't resolve against min-content</title>
+<link rel="author" title="Google Inc." href="https://www.google.com/" />
+
+<style>
+.inner {
+  background-color: green;
+}
+</style>
+
+<body>
+  <div class="outer">
+    <div class="inner">This should be a single-line green background with no red visible.</div>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/percentage-resolution-001.html b/tests/wpt/web-platform-tests/css/css-sizing/percentage-resolution-001.html
new file mode 100644
index 000000000000..b2cc727ca7a9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/percentage-resolution-001.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Sizing: Test that percentages don't resolve against min-content</title>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#percentage-sizing" />
+<link rel="author" title="Google Inc." href="https://www.google.com/" />
+<link rel="match" href="percentage-resolution-001-ref.html" />
+
+<style>
+.outer {
+  min-height: min-content;
+  max-height: min-content;
+  height: 500px;
+  background-color: red;
+}
+
+.inner {
+  height: 50%;
+  background-color: green;
+}
+</style>
+
+<body>
+  <div class="outer">
+    <div class="inner">This should be a single-line green background with no red visible.</div>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-interpolation.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-interpolation.html
index 1ce74f76d25d..eff60ba72f72 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-interpolation.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/rotate-interpolation.html
@@ -55,10 +55,10 @@
   to: '-1 1 0 60deg',
 }, [
   {at: -1, expect: '0.447214 -0.447214 0.774597 104.478deg'},
-  {at: 0, expect: '45deg'},
+  {at: 0, expect: 'z 45deg'},
   {at: 0.125, expect: '-0.136456 0.136456 0.981203 40.6037deg'},
   {at: 0.875, expect: '-0.70246 0.70246 0.114452 53.1994deg'},
-  {at: 1, expect: '-1 1 0 60deg'},
+  {at: 1, expect: '-0.71 0.71 0 60deg'},
   {at: 2, expect: '-0.637897 0.637897 -0.431479 124.975deg'}
 ]);
 
@@ -67,12 +67,12 @@
   from: 'none',
   to: '7 -8 9 400grad',
 }, [
-  {at: -1, expect: '7 -8 9 -400grad'},
-  {at: 0, expect: 'none'},
-  {at: 0.125, expect: '7 -8 9 50grad'},
-  {at: 0.875, expect: '7 -8 9 350grad'},
-  {at: 1, expect: '7 -8 9 400grad'},
-  {at: 2, expect: '7 -8 9 800grad'}
+  {at: -1, expect: '0.5 -0.57 0.65 -400grad'},
+  {at: 0, expect: '0.5 -0.57 0.65 0deg'},
+  {at: 0.125, expect: '0.5 -0.57 0.65 50grad'},
+  {at: 0.875, expect: '0.5 -0.57 0.65 350grad'},
+  {at: 1, expect: '0.5 -0.57 0.65 400grad'},
+  {at: 2, expect: '0.5 -0.57 0.65 800grad'}
 ]);
 
 test_interpolation({
@@ -94,7 +94,7 @@
   to: '30deg',
 }, [
   {at: -1, expect: '-30deg'},
-  {at: 0, expect: 'none'},
+  {at: 0, expect: '0deg'},
   {at: 0.25, expect: '7.5deg'},
   {at: 0.75, expect: '22.5deg'},
   {at: 1, expect: '30deg'},
@@ -133,7 +133,7 @@
   to: '30deg',
 }, [
   {at: -1, expect: '-30deg'},
-  {at: 0, expect: 'none'},
+  {at: 0, expect: '0deg'},
   {at: 0.25, expect: '7.5deg'},
   {at: 0.75, expect: '22.5deg'},
   {at: 1, expect: '30deg'},
@@ -171,21 +171,26 @@
   from: '1 -2.5 3.64 100deg',
   to: '1 -2.5 3.64 -100deg',
 }, [
-  {at: -1, expect: '1 -2.5 3.64 300deg'},
-  {at: 0, expect: '1 -2.5 3.64 100deg'},
-  {at: 0.25, expect: '1 -2.5 3.64 50deg'},
-  {at: 0.75, expect: '1 -2.5 3.64 -50deg'},
-  {at: 1, expect: '1 -2.5 3.64 -100deg'},
-  {at: 2, expect: '1 -2.5 3.64 -300deg'},
+  {at: -1, expect: '0.22 -0.55 0.8 300deg'},
+  {at: 0, expect: '0.22 -0.55 0.8 100deg'},
+  {at: 0.25, expect: '0.22 -0.55 0.8 50deg'},
+  {at: 0.75, expect: '0.22 -0.55 0.8 -50deg'},
+  {at: 1, expect: '0.22 -0.55 0.8 -100deg'},
+  {at: 2, expect: '0.22 -0.55 0.8 -300deg'},
 ]);
 
+// The rotation angle gets interpolated numerically and the rotation vector
+// of the non-zero angle is used or (0, 0, 1) if both angles are zero.
+// So, we have to convert "1 0 0 0deg" into "0 1 0 0deg", and apply the same
+// concept for other test cases.
+// https://drafts.csswg.org/css-transforms-2/#interpolation-of-transform-functions
 test_interpolation({
   property: 'rotate',
   from: '1 0 0 0deg',
   to: '0 1 0 10deg',
 }, [
   {at: -1, expect: '0 1 0 -10deg'},
-  {at: 0, expect: '1 0 0 0deg'},
+  {at: 0, expect: '0 1 0 0deg'},
   {at: 0.25, expect: '0 1 0 2.5deg'},
   {at: 0.75, expect: '0 1 0 7.5deg'},
   {at: 1, expect: '0 1 0 10deg'},
@@ -198,11 +203,20 @@
   to: '0 1 1 135deg',
 }, [
   {at: -1, expect: '0.67 -0.06 -0.74 124.97deg'},
-  {at: 0, expect: '1 1 0 90deg'},
+  {at: 0, expect: '0.71 0.71 0 90deg'},
   {at: 0.25, expect: '0.54 0.8 0.26 94.83deg'},
   {at: 0.75, expect: '0.17 0.78 0.61 118.68deg'},
-  {at: 1, expect: '0 1 1 135deg'},
-  {at: 2, expect: '0.52 -0.29 -0.81 151.04deg'},
+  {at: 1, expect: '0 0.71 0.71 135deg'},
+  // The result in Blink is '0.52 -0.29 -0.81 151.04deg', and the result in
+  // Gecko is `-0.52 0.29 0.8 208.96deg`. Both of them can be represented as the
+  // same 3d rotation (but by an opposite direction vector and angle).
+  // The spec only mentions we should use Slerp to do interpolation for rotate
+  // property, but it seems the implementation detail for extrapolation are
+  // different (because this is not in the range of [0, 1]).
+  // For now, we make both results pass because their rendering results are the
+  // same.
+  {at: 2, expect: '0.52 -0.29 -0.81 151.04deg',
+          option: '-0.52 0.29 0.81 208.96deg'},
 ]);
 
 test_interpolation({
@@ -211,7 +225,7 @@
   to: '1 0 0 450deg',
 }, [
   {at: -1, expect: '1 0 0 -450deg'},
-  {at: 0, expect: '0 1 0 0deg'},
+  {at: 0, expect: '1 0 0 0deg'},
   {at: 0.25, expect: '1 0 0 112.5deg'},
   {at: 0.75, expect: '1 0 0 337.5deg'},
   {at: 1, expect: '1 0 0 450deg'},
@@ -227,7 +241,7 @@
   {at: 0, expect: '1 0 0 450deg'},
   {at: 0.25, expect: '1 0 0 337.5deg'},
   {at: 0.75, expect: '1 0 0 112.5deg'},
-  {at: 1, expect: '0 1 0 0deg'},
+  {at: 1, expect: '1 0 0 0deg'},
   {at: 2, expect: '1 0 0 -450deg'},
 ]);
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/scale-interpolation.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/scale-interpolation.html
index 29999d49ccf8..0e33371955bb 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/animation/scale-interpolation.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/scale-interpolation.html
@@ -121,7 +121,7 @@
         to: '4 3 2',
       }, [
         {at: -1, expect: '-2 -1 0'},
-        {at: 0, expect: 'none'},
+        {at: 0, expect: '1'},
         {at: 0.125, expect: '1.375 1.25 1.125'},
         {at: 0.875, expect: '3.625 2.75 1.875'},
         {at: 1, expect: '4 3 2'},
@@ -149,7 +149,7 @@
         to: '2 0.5 1',
       }, [
         {at: -1, expect: '0 1.5'},
-        {at: 0, expect: 'none'},
+        {at: 0, expect: '1'},
         {at: 0.25, expect: '1.25 0.875'},
         {at: 0.75, expect: '1.75 0.625'},
         {at: 1, expect: '2 0.5'},
@@ -165,7 +165,7 @@
         {at: 0, expect: '2 0.5'},
         {at: 0.25, expect: '1.75 0.6251'},
         {at: 0.75, expect: '1.25 0.875'},
-        {at: 1, expect: 'none'},
+        {at: 1, expect: '1'},
         {at: 2, expect: '0 1.5'},
       ]);
 
@@ -177,7 +177,7 @@
         to: '1.5 1',
       }, [
         {at: -1, expect: '0.5 1'},
-        {at: 0, expect: 'none'},
+        {at: 0, expect: '1'},
         {at: 0.25, expect: '1.125 1'},
         {at: 0.75, expect: '1.375 1'},
         {at: 1, expect: '1.5 1'},
@@ -218,7 +218,7 @@
         to: 'inherit',
       }, [
         {at: -1, expect: '1.5 1 0'},
-        {at: 0, expect: 'none'},
+        {at: 0, expect: '1'},
         {at: 0.25, expect: '0.875 1 1.25'},
         {at: 0.75, expect: '0.625 1 1.75'},
         {at: 1, expect: '0.5 1 2'},
@@ -234,7 +234,7 @@
         {at: 0, expect: '0.5 1 2'},
         {at: 0.25, expect: '0.625 1 1.75'},
         {at: 0.75, expect: '0.875 1 1.25'},
-        {at: 1, expect: 'none'},
+        {at: 1, expect: '1'},
         {at: 2, expect: '1.5 1 0'},
       ]);
     </script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-interpolation.html b/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-interpolation.html
index 1764df3e9670..67d9b1362116 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-interpolation.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/animation/translate-interpolation.html
@@ -149,7 +149,7 @@
         to: '8px 80% 800px',
       }, [
         {at: -1, expect: '-8px -80% -800px'},
-        {at: 0, expect: 'none'},
+        {at: 0, expect: '0px'},
         {at: 0.125, expect: '1px 10% 100px'},
         {at: 0.875, expect: '7px 70% 700px'},
         {at: 1, expect: '8px 80% 800px'},
@@ -177,7 +177,7 @@
         to: '200px 100px 200px',
       }, [
         {at: -1, expect: '-200px -100px -200px'},
-        {at: 0, expect: 'none'},
+        {at: 0, expect: '0px'},
         {at: 0.25, expect: '50px 25px 50px'},
         {at: 0.75, expect: '150px 75px 150px'},
         {at: 1, expect: '200px 100px 200px'},
@@ -193,7 +193,7 @@
         {at: 0, expect: '200px 100px 400px'},
         {at: 0.25, expect: '150px 75px 300px'},
         {at: 0.75, expect: '50px 25px 100px'},
-        {at: 1, expect: 'none'},
+        {at: 1, expect: '0px'},
         {at: 2, expect: '-200px -100px -400px'},
       ]);
 
@@ -205,7 +205,7 @@
         to: '20px',
       }, [
         {at: -1, expect: '-20px'},
-        {at: 0, expect: 'none'},
+        {at: 0, expect: '0px'},
         {at: 0.25, expect: '5px'},
         {at: 0.75, expect: '15px'},
         {at: 1, expect: '20px'},
@@ -246,7 +246,7 @@
         to: 'inherit',
       }, [
         {at: -1, expect: '-100px -200px -300px'},
-        {at: 0, expect: 'none'},
+        {at: 0, expect: '0px'},
         {at: 0.25, expect: '25px 50px 75px'},
         {at: 0.75, expect: '75px 150px 225px'},
         {at: 1, expect: '100px 200px 300px'},
@@ -262,7 +262,7 @@
         {at: 0, expect: '100px 200px 300px'},
         {at: 0.25, expect: '75px 150px 225px'},
         {at: 0.75, expect: '25px 50px 75px'},
-        {at: 1, expect: 'none'},
+        {at: 1, expect: '0px'},
         {at: 2, expect: '-100px -200px -300px'},
       ]);
     </script>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/vertical-align-interpolation.html b/tests/wpt/web-platform-tests/css/css-transitions/animations/vertical-align-interpolation.html
new file mode 100644
index 000000000000..c81c83239354
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transitions/animations/vertical-align-interpolation.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>vertical-align interpolation</title>
+<link rel="help" href="https://www.w3.org/TR/CSS2/visudet.html#propdef-vertical-align">
+<meta name="assert" content="vertical-align supports animation">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/interpolation-testcommon.js"></script>
+
+<style>
+.parent {
+  vertical-align: 100px;
+}
+.target {
+  width: 100px;
+  height: 100px;
+  background-color: black;
+  display: inline-block;
+  vertical-align: 10px;
+}
+.expected {
+  background-color: green;
+}
+</style>
+
+<body>
+<script>
+test_interpolation({
+  property: 'vertical-align',
+  from: neutralKeyframe,
+  to: '40px',
+}, [
+  {at: -0.5, expect: '-5px'},
+  {at: 0, expect: '10px'},
+  {at: 0.3, expect: '19px'},
+  {at: 0.6, expect: '28px'},
+  {at: 1, expect: '40px'},
+  {at: 1.5, expect: '55px'},
+]);
+
+test_no_interpolation({
+  property: 'vertical-align',
+  from: 'initial',
+  to: '40px',
+});
+
+test_interpolation({
+  property: 'vertical-align',
+  from: 'inherit',
+  to: '40px',
+}, [
+  {at: -0.5, expect: '130px'},
+  {at: 0, expect: '100px'},
+  {at: 0.3, expect: '82px'},
+  {at: 0.6, expect: '64px'},
+  {at: 1, expect: '40px'},
+  {at: 1.5, expect: '10px'},
+]);
+
+test_no_interpolation({
+  property: 'vertical-align',
+  from: 'unset',
+  to: '40px',
+});
+
+test_interpolation({
+  property: 'vertical-align',
+  from: '0px',
+  to: '100px'
+}, [
+  {at: -0.5, expect: '-50px'},
+  {at: 0, expect: '0px'},
+  {at: 0.3, expect: '30px'},
+  {at: 0.6, expect: '60px'},
+  {at: 1, expect: '100px'},
+  {at: 1.5, expect: '150px'}
+]);
+
+test_interpolation({
+  property: 'vertical-align',
+  from: '40px',
+  to: '40%'
+}, [
+  {at: -0.5, expect: 'calc(60px - 20%)'},
+  {at: 0, expect: 'calc(40px + 0%)'},
+  {at: 0.3, expect: 'calc(28px + 12%)'},
+  {at: 1, expect: 'calc(0px + 40%)'},
+  {at: 1.5, expect: 'calc(-20px + 60%)'}
+]);
+
+test_no_interpolation({
+  property: 'vertical-align',
+  from: 'super',
+  to: '40%'
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/animations/z-index-interpolation.html b/tests/wpt/web-platform-tests/css/css-transitions/animations/z-index-interpolation.html
new file mode 100644
index 000000000000..9673cc4d8cbb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transitions/animations/z-index-interpolation.html
@@ -0,0 +1,130 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>z-index interpolation</title>
+<link rel="help" href="https://www.w3.org/TR/CSS2/visuren.html#z-index">
+<meta name="assert" content="z-index supports animation">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/interpolation-testcommon.js"></script>
+
+<style>
+body {
+  margin-top: 20px;
+}
+.layer-reference {
+  position: fixed;
+  top: 0px;
+  height: 100vh;
+  width: 50px;
+  background-color: rgba(255, 255, 255, 0.75);
+  font-family: sans-serif;
+  text-align: center;
+  padding-top: 5px;
+  border: 1px solid;
+}
+.parent {
+  z-index: 15;
+}
+.target {
+  position: relative;
+  width: 350px;
+  height: 10px;
+  z-index: -2;
+}
+.actual {
+  background-color: black;
+}
+.expected {
+  background-color: green;
+}
+</style>
+
+<body></body>
+
+<script>
+test_interpolation({
+  property: 'z-index',
+  from: neutralKeyframe,
+  to: '5',
+}, [
+  {at: -0.3, expect: '-4'},
+  {at: 0, expect: '-2'},
+  {at: 0.3, expect: '0'},
+  {at: 0.6, expect: '2'},
+  {at: 1, expect: '5'},
+  {at: 1.5, expect: '9'},
+]);
+
+test_no_interpolation({
+  property: 'z-index',
+  from: 'initial',
+  to: '5',
+});
+
+// We fail to inherit correctly due to style overadjustment: crbug.com/375982
+test_interpolation({
+  property: 'z-index',
+  from: 'inherit',
+  to: '5',
+}, [
+  {at: -0.3, expect: '18'},
+  {at: 0, expect: '15'},
+  {at: 0.3, expect: '12'},
+  {at: 0.6, expect: '9'},
+  {at: 1, expect: '5'},
+  {at: 1.5, expect: '0'},
+]);
+
+test_no_interpolation({
+  property: 'z-index',
+  from: 'unset',
+  to: '5',
+});
+
+test_interpolation({
+  property: 'z-index',
+  from: '-5',
+  to: '5'
+}, [
+  {at: -0.3, expect: '-8'},
+  {at: 0, expect: '-5'},
+  {at: 0.3, expect: '-2'},
+  {at: 0.6, expect: '1'},
+  {at: 1, expect: '5'},
+  {at: 1.5, expect: '10'},
+]);
+
+test_interpolation({
+  property: 'z-index',
+  from: '2',
+  to: '4'
+}, [
+  {at: -0.3, expect: '1'},
+  {at: 0, expect: '2'},
+  {at: 0.3, expect: '3'},
+  {at: 0.6, expect: '3'},
+  {at: 1, expect: '4'},
+  {at: 1.5, expect: '5'},
+]);
+
+test_interpolation({
+  property: 'z-index',
+  from: '-2',
+  to: '-4'
+}, [
+  {at: -0.3, expect: '-1'},
+  {at: 0, expect: '-2'},
+  {at: 0.1, expect: '-2'},
+  {at: 0.3, expect: '-3'},
+  {at: 0.6, expect: '-3'},
+  {at: 1, expect: '-4'},
+  {at: 1.5, expect: '-5'},
+]);
+
+test_no_interpolation({
+  property: 'z-index',
+  from: 'auto',
+  to: '10',
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-length-percent-serialize.html b/tests/wpt/web-platform-tests/css/css-values/minmax-length-percent-serialize.html
index f0ffd4ea2ce2..c353fa849076 100644
--- a/tests/wpt/web-platform-tests/css/css-values/minmax-length-percent-serialize.html
+++ b/tests/wpt/web-platform-tests/css/css-values/minmax-length-percent-serialize.html
@@ -13,36 +13,36 @@
   test_valid_value(property, value, expected);
 }
 
-test_valid_length_percent('min(1px + 1%)', 'min(1px + 1%)');
-test_valid_length_percent('min(1cm + 1%)', 'min(1cm + 1%)');
-test_valid_length_percent('min(1mm + 1%)', 'min(1mm + 1%)');
-test_valid_length_percent('min(1Q + 1%)', 'min(1q + 1%)');
-test_valid_length_percent('min(1in + 1%)', 'min(1in + 1%)');
-test_valid_length_percent('min(1pc + 1%)', 'min(1pc + 1%)');
-test_valid_length_percent('min(1pt + 1%)', 'min(1pt + 1%)');
-test_valid_length_percent('min(1em + 1%)', 'min(1em + 1%)');
-test_valid_length_percent('min(1ex + 1%)', 'min(1ex + 1%)');
-test_valid_length_percent('min(1ch + 1%)', 'min(1ch + 1%)');
-test_valid_length_percent('min(1rem + 1%)', 'min(1rem + 1%)');
-test_valid_length_percent('min(1vh + 1%)', 'min(1vh + 1%)');
-test_valid_length_percent('min(1vw + 1%)', 'min(1vw + 1%)');
-test_valid_length_percent('min(1vmin + 1%)', 'min(1vmin + 1%)');
-test_valid_length_percent('min(1vmax + 1%)', 'min(1vmax + 1%)');
-test_valid_length_percent('max(1px + 1%)', 'max(1px + 1%)');
-test_valid_length_percent('max(1cm + 1%)', 'max(1cm + 1%)');
-test_valid_length_percent('max(1mm + 1%)', 'max(1mm + 1%)');
-test_valid_length_percent('max(1Q + 1%)', 'max(1q + 1%)');
-test_valid_length_percent('max(1in + 1%)', 'max(1in + 1%)');
-test_valid_length_percent('max(1pc + 1%)', 'max(1pc + 1%)');
-test_valid_length_percent('max(1pt + 1%)', 'max(1pt + 1%)');
-test_valid_length_percent('max(1em + 1%)', 'max(1em + 1%)');
-test_valid_length_percent('max(1ex + 1%)', 'max(1ex + 1%)');
-test_valid_length_percent('max(1ch + 1%)', 'max(1ch + 1%)');
-test_valid_length_percent('max(1rem + 1%)', 'max(1rem + 1%)');
-test_valid_length_percent('max(1vh + 1%)', 'max(1vh + 1%)');
-test_valid_length_percent('max(1vw + 1%)', 'max(1vw + 1%)');
-test_valid_length_percent('max(1vmin + 1%)', 'max(1vmin + 1%)');
-test_valid_length_percent('max(1vmax + 1%)', 'max(1vmax + 1%)');
+test_valid_length_percent('min(1px + 1%)', 'min(1% + 1px)');
+test_valid_length_percent('min(1cm + 1%)', 'min(1% + 1cm)');
+test_valid_length_percent('min(1mm + 1%)', 'min(1% + 1mm)');
+test_valid_length_percent('min(1Q + 1%)', 'min(1% + 1q)');
+test_valid_length_percent('min(1in + 1%)', 'min(1% + 1in)');
+test_valid_length_percent('min(1pc + 1%)', 'min(1% + 1pc)');
+test_valid_length_percent('min(1pt + 1%)', 'min(1% + 1pt)');
+test_valid_length_percent('min(1em + 1%)', 'min(1% + 1em)');
+test_valid_length_percent('min(1ex + 1%)', 'min(1% + 1ex)');
+test_valid_length_percent('min(1ch + 1%)', 'min(1% + 1ch)');
+test_valid_length_percent('min(1rem + 1%)', 'min(1% + 1rem)');
+test_valid_length_percent('min(1vh + 1%)', 'min(1% + 1vh)');
+test_valid_length_percent('min(1vw + 1%)', 'min(1% + 1vw)');
+test_valid_length_percent('min(1vmin + 1%)', 'min(1% + 1vmin)');
+test_valid_length_percent('min(1vmax + 1%)', 'min(1% + 1vmax)');
+test_valid_length_percent('max(1px + 1%)', 'max(1% + 1px)');
+test_valid_length_percent('max(1cm + 1%)', 'max(1% + 1cm)');
+test_valid_length_percent('max(1mm + 1%)', 'max(1% + 1mm)');
+test_valid_length_percent('max(1Q + 1%)', 'max(1% + 1q)');
+test_valid_length_percent('max(1in + 1%)', 'max(1% + 1in)');
+test_valid_length_percent('max(1pc + 1%)', 'max(1% + 1pc)');
+test_valid_length_percent('max(1pt + 1%)', 'max(1% + 1pt)');
+test_valid_length_percent('max(1em + 1%)', 'max(1% + 1em)');
+test_valid_length_percent('max(1ex + 1%)', 'max(1% + 1ex)');
+test_valid_length_percent('max(1ch + 1%)', 'max(1% + 1ch)');
+test_valid_length_percent('max(1rem + 1%)', 'max(1% + 1rem)');
+test_valid_length_percent('max(1vh + 1%)', 'max(1% + 1vh)');
+test_valid_length_percent('max(1vw + 1%)', 'max(1% + 1vw)');
+test_valid_length_percent('max(1vmin + 1%)', 'max(1% + 1vmin)');
+test_valid_length_percent('max(1vmax + 1%)', 'max(1% + 1vmax)');
 
 test_valid_length_percent('min(20px, 10%)', 'min(20px, 10%)');
 test_valid_length_percent('min(1em, 10%)', 'min(1em, 10%)');
diff --git a/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-horizontal-partially-visible.html b/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-horizontal-partially-visible.html
new file mode 100644
index 000000000000..1e8bc50071f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom-view/scrollIntoView-horizontal-partially-visible.html
@@ -0,0 +1,47 @@
+<!doctype html>
+<title>CSSOM View - scrollIntoView scrolls partially-visible element in both inline and block directions.</title>
+<meta charset="utf-8">
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-scrollintoview">
+<link rel="help" href="https://bugs.webkit.org/show_bug.cgi?id=203497">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=916631">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #scroller {
+    width: 200px;
+    height: 200px;
+    padding-top: 200px;
+    padding-left: 200px;
+    background: purple;
+    overflow: hidden;
+  }
+  #child {
+    width: 400px;
+    height: 400px;
+    background: green;
+  }
+</style>
+<div id="scroller">
+  <div id="child"></div>
+</div>
+<script>
+  test(function() {
+    let scroller = document.getElementById("scroller");
+    let child = document.getElementById("child");
+
+    scroller.scrollTop = 0;
+    scroller.scrollLeft = 0;
+
+    assert_equals(scroller.scrollTop, 0, "Precondition");
+    assert_equals(scroller.scrollLeft, 0, "Precondition");
+    assert_not_equals(scroller.scrollTopMax, 0, "Precondition")
+    assert_not_equals(scroller.scrollLeftMax, 0, "Precondition")
+
+    child.scrollIntoView();
+
+    assert_equals(scroller.scrollTop, 200, "Should have scrolled in the block direction");
+    assert_equals(scroller.scrollLeft, 200, "Should have scrolled in the inline direction");
+  }, "scrollIntoView scrolls partially-visible child in both axes");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/support/grid.css b/tests/wpt/web-platform-tests/css/support/grid.css
index 78fdd5e975ad..5cfb15e7ef0d 100644
--- a/tests/wpt/web-platform-tests/css/support/grid.css
+++ b/tests/wpt/web-platform-tests/css/support/grid.css
@@ -32,6 +32,18 @@
   grid-row: 1 / 2;
 }
 
+.firstRowThirdColumn {
+  background-color: magenta;
+  grid-column: 3;
+  grid-row: 1;
+}
+
+.firstRowFourthColumn {
+  background-color: green;
+  grid-column: 4;
+  grid-row: 1;
+}
+
 .secondRowFirstColumn {
   background-color: purple;
   grid-column: 1;
@@ -62,42 +74,30 @@
   grid-row-end: 3;
 }
 
-.thirdRowSecondColumn {
-  background-color: red;
-  grid-column: 2;
-  grid-row: 3;
-}
-
-.thirdRowThirdColumn {
-  background-color: salmon;
-  grid-column: 3;
-  grid-row: 3;
-}
-
-.firstRowThirdColumn {
-  background-color: magenta;
-  grid-column: 3;
-  grid-row: 1;
-}
-
 .secondRowThirdColumn {
   background-color: navy;
   grid-column: 3;
   grid-row: 2;
 }
 
-.firstRowFourthColumn {
-  background-color: green;
-  grid-column: 4;
-  grid-row: 1;
-}
-
 .secondRowFourthColumn {
   background-color: pink;
   grid-column: 4;
   grid-row: 2;
 }
 
+.thirdRowSecondColumn {
+  background-color: red;
+  grid-column: 2;
+  grid-row: 3;
+}
+
+.thirdRowThirdColumn {
+  background-color: salmon;
+  grid-column: 3;
+  grid-row: 3;
+}
+
 .firstAutoRowSecondAutoColumn {
   grid-row: 1 / auto;
   grid-column: 2 / auto;
diff --git a/tests/wpt/web-platform-tests/css/support/interpolation-testcommon.js b/tests/wpt/web-platform-tests/css/support/interpolation-testcommon.js
index 9e63b02cb703..3c9754c69412 100644
--- a/tests/wpt/web-platform-tests/css/support/interpolation-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/support/interpolation-testcommon.js
@@ -260,8 +260,9 @@
     return expectations.map(function(expectation) {
       var actualTargetContainer = createTargetContainer(testContainer, 'actual');
       var expectedTargetContainer = createTargetContainer(testContainer, 'expected');
-      if (!isNeutralKeyframe(expectation.expect)) {
-        expectedTargetContainer.target.style.setProperty(property, expectation.expect);
+      var expectedStr = expectation.option || expectation.expect;
+      if (!isNeutralKeyframe(expectedStr)) {
+        expectedTargetContainer.target.style.setProperty(property, expectedStr);
       }
       var target = actualTargetContainer.target;
       interpolationMethod.setup(property, from, target);
@@ -284,7 +285,7 @@
           comparisonFunction(
               getComputedStyle(target).getPropertyValue(property),
               expectedValue);
-        }, `${testText} at (${expectation.at}) should be [${sanitizeUrls(expectation.expect)}]`);
+        }, `${testText} at (${expectation.at}) should be [${sanitizeUrls(expectedStr)}]`);
       };
       return target;
     });
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md b/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
index 1bdf06613f99..a17f5795bc33 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/testharness-api.md
@@ -430,18 +430,38 @@ not possible to make the test reliable in some other way.
 
 ## Setup ##
 
-Sometimes tests require non-trivial setup that may fail. For this purpose
-there is a `setup()` function, that may be called with one or two arguments.
-The two argument version is:
+Sometimes tests require non-trivial setup that may fail. testharness.js
+provides two global functions for this purpose, `setup` and `promise_setup`.
+
+`setup()` may be called with one or two arguments. The two argument version is:
 
 ```js
 setup(func, properties)
 ```
 
-The one argument versions may omit either argument.
-func is a function to be run synchronously. `setup()` becomes a no-op once
-any tests have returned results. Properties are global properties of the test
-harness. Currently recognised properties are:
+The one argument version may omit either argument. `func` is a function to be
+run synchronously. `setup()` becomes a no-op once any tests have returned
+results. `properties` is an object which specifies global properties of the
+test harness (enumerated in the following section).
+
+`promise_setup()` allows authors to pause testing until some asynchronous
+operation has completed. It has the following signature:
+
+```js
+promise_setup(func, properties)
+```
+
+Here, the `func` argument is required. This argument must be a function which
+returns an object with a `then` method (e.g. an ECMAScript Promise instance);
+the harness will wait for the fulfillment of this value before executing any
+additional subtests defined with the `promise_test` function. If the value is
+rejected, the harness will report an error and cancel the remaining tests.
+`properties` may optionally be provided as an object which specifies global
+properties of the test harness (enumerated in the following section).
+
+### Setup properties ##
+
+Both setup functions recognize the following properties:
 
 `explicit_done` - Wait for an explicit call to done() before declaring all
 tests complete (see below; implicitly true for single page tests)
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/appcache.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/appcache.tentative.https.sub.html
index 3aa902cc1462..8912548ab1c9 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/appcache.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/appcache.tentative.https.sub.html
@@ -14,7 +14,8 @@
           .then(t.step_func_done(text => assert_header_equals(text, {
             "site": "same-origin",
             "user": "",
-            "mode": "no-cors"
+            "mode": "no-cors",
+            "dest": ""
           })))
           .catch(t.unreached_func("Fetching and verifying the results should succeed."));
 });
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/embed.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/embed.tentative.https.sub.html
index 77042e85de9f..8a59b821b455 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/embed.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/embed.tentative.https.sub.html
@@ -23,7 +23,7 @@
         let el = document.createElement('embed');
         el.src = origins[site] + "/fetch/metadata/resources/record-header.py?file=" + key;
         el.onload = _ => {
-          let expected = {"dest": "embed", "site": site, "user": "", "mode":"no-cors"};
+          let expected = {"dest": "embed", "site": site, "user": "", "mode": "navigate"};
           validate_expectations(key, expected, site + " embed")
             .then(resolve)
             .catch(reject);
@@ -41,7 +41,7 @@
         el.src = "/common/blank.html";
         el.addEventListener("load", _ => {
           el.addEventListener("load", _ => {
-            let expected = {"dest": "embed", "site": site, "user":"", "mode":"no-cors"};
+            let expected = {"dest": "embed", "site": site, "user":"", "mode":"navigate"};
             validate_expectations(key, expected, "Navigate to " + site + " embed")
               .then(resolve)
               .catch(reject);
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/fetch-preflight.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/fetch-preflight.tentative.https.sub.html
index 1ab3de615c8a..ec987e1ca4b8 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/fetch-preflight.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/fetch-preflight.tentative.https.sub.html
@@ -5,34 +5,28 @@
 <script>
   // Site
   promise_test(t => {
-    return fetch("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py",
+    return validate_expectations_custom_url("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py",
                  {
                    mode: "cors",
                    headers: { 'x-test': 'testing' }
-                 })
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+                 }, {
             "site": "same-site",
             "user": "",
             "mode": "cors",
-          });
-        });
+            "dest": "empty"
+          }, "Same-site fetch with preflight");
   }, "Same-site fetch with preflight");
 
   promise_test(t => {
-    return fetch("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py",
+    return validate_expectations_custom_url("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py",
                  {
                    mode: "cors",
                    headers: { 'x-test': 'testing' }
-                 })
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+                 }, {
             "site": "cross-site",
             "user": "",
             "mode": "cors",
-          });
-        });
+            "dest": "empty"
+          }, "Cross-site fetch with preflight");
   }, "Cross-site fetch with preflight");
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html
index 13016fe35374..9f494461372d 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/fetch-via-serviceworker--fallback.tentative.https.sub.html
@@ -44,7 +44,7 @@
         const text = await response.text();
 
         // Verify presence of the expected Sec-Fetch-... request headers.
-        let expected = {"site":"same-origin", "user":"", "mode": "no-cors"};
+        let expected = {"site":"same-origin", "user":"", "mode": "no-cors", "dest": "empty"};
         assert_header_equals(text, expected);
       }, 'Sec-Fetch headers after SW fallback');
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html
index d43715785b4a..03d5fd1cc31b 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/fetch-via-serviceworker--respondWith.tentative.https.sub.html
@@ -45,7 +45,7 @@
         const text = await response.text();
 
         // Verify presence of the expected Sec-Fetch-... request headers.
-        let expected = {"site":"same-origin", "user":"", "mode": "no-cors"};
+        let expected = {"site":"same-origin", "user":"", "mode": "no-cors", "dest": "empty"};
         assert_header_equals(text, expected);
       }, 'Sec-Fetch headers after SW fallback');
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/fetch.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/fetch.tentative.https.sub.html
index 72fb52ecd5d8..bb7d20009442 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/fetch.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/fetch.tentative.https.sub.html
@@ -5,75 +5,57 @@
 <script>
   // Site
   promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {}, {
             "site": "same-origin",
             "user": "",
             "mode": "cors",
-          });
-        });
+            "dest": "empty"
+          }, "Same-origin fetch");
   }, "Same-origin fetch");
 
   promise_test(t => {
-    return fetch("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {}, {
             "site": "same-site",
             "user": "",
             "mode": "cors",
-          });
-        });
+            "dest": "empty"
+          }, "Same-site fetch");
   }, "Same-site fetch");
 
   promise_test(t => {
-    return fetch("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {}, {
             "site": "cross-site",
             "user": "",
             "mode": "cors",
-          });
-        });
+            "dest": "empty"
+          }, "Cross-site fetch");
   }, "Cross-site fetch");
 
   // Mode
   promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "same-origin"})
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "same-origin"}, {
             "site": "same-origin",
             "user": "",
             "mode": "same-origin",
-          });
-        });
+            "dest": "empty"
+          }, "Same-origin mode");
   }, "Same-origin mode");
 
   promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "cors"})
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "cors"}, {
             "site": "same-origin",
             "user": "",
             "mode": "cors",
-          });
-        });
+            "dest": "empty"
+          }, "CORS mode");
   }, "CORS mode");
 
   promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "no-cors"})
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "no-cors"}, {
             "site": "same-origin",
             "user": "",
             "mode": "no-cors",
-          });
-        });
+            "dest": "empty"
+          }, "no-CORS mode");
   }, "no-CORS mode");
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/fetch.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/fetch.tentative.sub.html
index a14c2c5f411c..1659a9fb6bf2 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/fetch.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/fetch.tentative.sub.html
@@ -8,28 +8,22 @@
   // https://github.com/w3c/webappsec-fetch-metadata/issues/34
   promise_test(t => {
     assert_equals(location.protocol, "http:");
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {}, {
             "site": "cross-site",
             "user": "",
             "mode": "cors",
-          });
-        });
+            "dest": "empty"
+          }, "http->https fetch (cross-scheme => cross-site)");
   }, "http->https fetch (cross-scheme => cross-site)");
 
   // http -> http should see no `Sec-Fetch-Site`.
   promise_test(t => {
     assert_equals(location.protocol, "http:");
-    return fetch("resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("resources/echo-as-json.py", {}, {
             "site": "",
             "user": "",
             "mode": "",
-          });
-        });
+            "dest": ""
+          }, "http->http fetch (non-trustworthy destination => no metadata)");
   }, "http->http fetch (non-trustworthy destination => no metadata)");
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/font.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/font.tentative.https.sub.html
index 9064dd689739..2c705085d6a3 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/font.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/font.tentative.https.sub.html
@@ -46,10 +46,8 @@
     promise_test(t => {
       return new Promise((resolve, reject) => {
         let key = "font-same-origin";
-        let expected = {"site":"same-origin", "user":"", "mode": "cors"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"same-origin", "user":"", "mode": "cors", "dest": "font"};
+        validate_expectations(key, expected, "Same-Origin font")
           .then(_ => resolve())
           .catch(e => reject(e));
         });
@@ -58,10 +56,8 @@
     promise_test(t => {
       return new Promise((resolve, reject) => {
         let key = "font-same-site";
-        let expected = {"site":"same-site", "user":"", "mode": "cors"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"same-site", "user":"", "mode": "cors", "dest": "font"};
+        validate_expectations(key, expected, "Same-Site font")
           .then(_ => resolve())
           .catch(e => reject(e));
         });
@@ -70,10 +66,8 @@
     promise_test(t => {
       return new Promise((resolve, reject) => {
         let key = "font-cross-site";
-        let expected = {"site":"cross-site", "user":"", "mode": "cors"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"cross-site", "user":"", "mode": "cors", "dest": "font"};
+        validate_expectations(key, expected, "Cross-Site font")
           .then(_ => resolve())
           .catch(e => reject(e));
         });
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/history.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/history.tentative.https.sub.html
index 0d78ec06035f..0a10f32beaf5 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/history.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/history.tentative.https.sub.html
@@ -10,7 +10,7 @@
 function add_test(description, report_host, go_back_host, expectations) {
   async_test(t => {
     // STEP1: Navigate a new window to report_host/post-to-owner.py
-    const url_suffix = '/fetch/metadata/resources/post-to-owner.py'
+    const url_suffix = '/fetch/metadata/resources/post-to-owner.py';
     const url = `https://${report_host}${url_suffix}`;
     const w = window.open(url, '_blank');
 
@@ -22,14 +22,14 @@
       if (msg_counter == 1) {
         // STEP2: Verify the headers (this is a sanity check that the same
         // headers are used here and in STEP5).
-        assert_header_equals(e.data, expectations);
+        assert_header_equals(e.data, expectations, description + " 1");
 
         // STEP3: Go to go_back_host/go-back.html (postponing this via
         // step_timeout ensures that go-back.html will get a separate
         // history entry - otherwise it might be treated as a client-side
         // redirect and we might end up with nowhere to go back to).
         t.step_timeout(() => {
-          const url_suffix = '/fetch/metadata/resources/go-back.html'
+          const url_suffix = '/fetch/metadata/resources/go-back.html';
           const url = `https://${go_back_host}${url_suffix}`;
           w.location = url;
         });
@@ -38,7 +38,7 @@
       } else if (msg_counter == 2) {
         // STEP5: Verify the headers (this is the main verification and focus
         // of the test).
-        assert_header_equals(e.data, expectations);
+        assert_header_equals(e.data, expectations, description + " 2");
 
         // STEP6: Finish the test.
         t.done();
@@ -57,7 +57,9 @@
   cross_site_host,  // go_back_host
   { "site": "same-origin",
     "user": "",
-    "mode": "navigate" });
+    "mode": "navigate",
+    "dest": "document"
+  });
 
 add_test(
   "back to same-site-initiated navigation",
@@ -65,7 +67,9 @@
   cross_site_host,  // go_back_host
   { "site": "same-site",
     "user": "",
-    "mode": "navigate" });
+    "mode": "navigate",
+    "dest": "document"
+  });
 
 add_test(
   "back to cross-site-initiated navigation",
@@ -73,6 +77,8 @@
   cross_site_host,  // go_back_host
   { "site": "cross-site",
     "user": "",
-    "mode": "navigate" });
+    "mode": "navigate",
+    "dest": "document"
+  });
 
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/iframe.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/iframe.tentative.https.sub.html
index 60ccbba721ba..1c793fd7e459 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/iframe.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/iframe.tentative.https.sub.html
@@ -17,7 +17,7 @@
         if (e.source != i.contentWindow)
           return;
 
-        assert_header_equals(e.data, expectations);
+        assert_header_equals(e.data, expectations, `{{host}} -> ${host} iframe: ${user_activated ? "user-activated" : "forced"}`);
         t.done();
       }));
 
@@ -44,36 +44,42 @@
   create_test("{{host}}:{{ports[https][0]}}", FORCED, {
     "site": "same-origin",
     "user": "",
-    "mode": "navigate"
+    "mode": "navigate",
+    "dest": "iframe"
   });
 
   create_test("{{hosts[][www]}}:{{ports[https][0]}}", FORCED, {
     "site": "same-site",
     "user": "",
-    "mode": "navigate"
+    "mode": "navigate",
+    "dest": "iframe"
   });
 
   create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", FORCED, {
     "site": "cross-site",
     "user": "",
-    "mode": "navigate"
+    "mode": "navigate",
+    "dest": "iframe"
   });
 
   create_test("{{host}}:{{ports[https][0]}}", USER, {
     "site": "same-origin",
     "user": "?1",
-    "mode": "navigate"
+    "mode": "navigate",
+    "dest": "iframe"
   });
 
   create_test("{{hosts[][www]}}:{{ports[https][0]}}", USER, {
     "site": "same-site",
     "user": "?1",
-    "mode": "navigate"
+    "mode": "navigate",
+    "dest": "iframe"
   });
 
   create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", USER, {
     "site": "cross-site",
     "user": "?1",
-    "mode": "navigate"
+    "mode": "navigate",
+    "dest": "iframe"
   });
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/iframe.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/iframe.tentative.sub.html
index be57362e9f05..e0d5b0b8cb82 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/iframe.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/iframe.tentative.sub.html
@@ -15,7 +15,8 @@
         "site": "",
         "user": "",
         "mode": "",
-      });
+        "dest": ""
+      }, "Non-secure same-origin iframe => No headers");
       t.done();
     }));
 
@@ -33,7 +34,8 @@
         "site": "",
         "user": "",
         "mode": "",
-      });
+        "dest": ""
+      }, "Non-secure same-site iframe => No headers");
       t.done();
     }));
 
@@ -51,7 +53,8 @@
         "site": "",
         "user": "",
         "mode": "",
-      });
+        "dest": ""
+      }, "Non-secure cross-site iframe => No headers.");
       t.done();
     }));
 
@@ -69,7 +72,8 @@
         "site": "cross-site",
         "user": "",
         "mode": "navigate",
-      });
+        "dest": "iframe"
+      }, "Secure, cross-site (cross-scheme, same-host) iframe");
       t.done();
     }));
 
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/img.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/img.tentative.https.sub.html
index ced6f9845e8a..93acffef11ae 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/img.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/img.tentative.https.sub.html
@@ -15,7 +15,8 @@
         got = {
           "mode": headers["sec-fetch-mode"],
           "site": headers["sec-fetch-site"],
-          "user": headers["sec-fetch-user"]
+          "user": headers["sec-fetch-user"],
+          "dest": headers["sec-fetch-dest"]
         };
         assert_header_equals(got, {
           "site": "same-origin",
@@ -23,7 +24,8 @@
           // that `image.py` encodes data.
           "user": undefined,
           "mode": "cors", // Because `loadImageInWindow` tacks on `crossorigin`
-        });
+          "dest": "image"
+        }, "Same-origin image");
       }),
     "Same-origin image");
 
@@ -35,7 +37,8 @@
         got = {
           "mode": headers["sec-fetch-mode"],
           "site": headers["sec-fetch-site"],
-          "user": headers["sec-fetch-user"]
+          "user": headers["sec-fetch-user"],
+          "dest": headers["sec-fetch-dest"]
         };
         assert_header_equals(got, {
           "site": "same-site",
@@ -43,7 +46,8 @@
           // that `image.py` encodes data.
           "user": undefined,
           "mode": "cors", // Because `loadImageInWindow` tacks on `crossorigin`
-        });
+          "dest": "image"
+        }, "Same-site image");
       }),
     "Same-site image");
 
@@ -55,7 +59,8 @@
         got = {
           "mode": headers["sec-fetch-mode"],
           "site": headers["sec-fetch-site"],
-          "user": headers["sec-fetch-user"]
+          "user": headers["sec-fetch-user"],
+          "dest": headers["sec-fetch-dest"]
         };
         assert_header_equals(got, {
           "site": "cross-site",
@@ -63,7 +68,8 @@
           // that `image.py` encodes data.
           "user": undefined,
           "mode": "cors", // Because `loadImageInWindow` tacks on `crossorigin`
-        });
+          "dest": "image"
+        }, "Cross-site image");
       }),
     "Cross-site image");
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/navigation.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/navigation.https.sub.html
index 1c2ce9537959..32c9cf77f90e 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/navigation.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/navigation.https.sub.html
@@ -8,12 +8,14 @@
     let expected = {
       "mode": "navigate",
       "site": "none",
+      "dest": "document"
     };
 
     let actual = {
       "mode": "{{headers[sec-fetch-mode]}}",
       "site": "{{headers[sec-fetch-site]}}",
       // Skipping `Sec-Fetch-User`, as the test harness isn't consistent here.
+      "dest": "{{headers[sec-fetch-dest]}}"
     };
 
     assert_header_equals(actual, expected);
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/object.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/object.tentative.https.sub.html
index cf1c26039995..fae5b37b592d 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/object.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/object.tentative.https.sub.html
@@ -16,10 +16,8 @@
       let e = document.createElement('object');
       e.data = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"site":"same-origin", "user":"", "mode":"no-cors"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"same-origin", "user":"", "mode":"navigate", "dest": "object"};
+        validate_expectations(key, expected, "Same-Origin object")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -35,10 +33,8 @@
       let e = document.createElement('object');
       e.data = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"site":"same-site", "user":"", "mode":"no-cors"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"same-site", "user":"", "mode":"navigate", "dest": "object"};
+        validate_expectations(key, expected, "Same-Site object")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -54,10 +50,8 @@
       let e = document.createElement('object');
       e.data = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"site":"cross-site", "user":"", "mode":"no-cors"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"cross-site", "user":"", "mode":"navigate", "dest": "object"};
+        validate_expectations(key, expected, "Cross-Site object")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/portal.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/portal.tentative.https.sub.html
index f9e370c67fbc..b9128944733b 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/portal.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/portal.tentative.https.sub.html
@@ -14,7 +14,7 @@
     async_test(t => {
       let p = document.createElement('portal');
       p.addEventListener('message', t.step_func(e => {
-        assert_header_equals(e.data, expectations);
+        assert_header_equals(e.data, expectations, `{{host}} -> ${host} portal`);
         t.done();
       }));
 
@@ -27,18 +27,21 @@
   create_test("{{host}}:{{ports[https][0]}}", {
     "site": "same-origin",
     "user": "",
-    "mode": "navigate"
+    "mode": "navigate",
+    "dest": "document"
   });
 
   create_test("{{hosts[][www]}}:{{ports[https][0]}}", {
     "site": "same-site",
     "user": "",
-    "mode": "navigate"
+    "mode": "navigate",
+    "dest": "document"
   });
 
   create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", {
     "site": "cross-site",
     "user": "",
-    "mode": "navigate"
+    "mode": "navigate",
+    "dest": "document"
   });
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/prefetch.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/prefetch.tentative.https.sub.html
index 30966f872f85..a0ff73c0d086 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/prefetch.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/prefetch.tentative.https.sub.html
@@ -21,7 +21,7 @@
       e.onload = t.step_func(e => {
         fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(t.step_func(response => response.text()))
-          .then(t.step_func_done(text => assert_header_equals(text, expected)))
+          .then(t.step_func_done(text => assert_header_equals(text, expected, `<link rel='prefetch' href='https://${host}/...'>`)))
           .catch(t.unreached_func("Fetching and verifying the results should succeed."));
       });
       e.onerror = t.unreached_func();
@@ -30,7 +30,7 @@
     }, `<link rel='prefetch' href='https://${host}/...'>`);
   }
 
-  create_test("{{host}}:{{ports[https][0]}}", {"site":"same-origin", "user":"", "mode": "cors"});
-  create_test("{{hosts[][www]}}:{{ports[https][0]}}", {"site":"same-site", "user":"", "mode": "cors"});
-  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", {"site":"cross-site", "user":"", "mode": "cors"});
+  create_test("{{host}}:{{ports[https][0]}}", {"site":"same-origin", "user":"", "mode": "cors", "dest": "empty"});
+  create_test("{{hosts[][www]}}:{{ports[https][0]}}", {"site":"same-site", "user":"", "mode": "cors", "dest": "empty"});
+  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", {"site":"cross-site", "user":"", "mode": "cors", "dest": "empty"});
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/preload.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/preload.tentative.https.sub.html
index e8c541ef7f95..6da69be76150 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/preload.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/preload.tentative.https.sub.html
@@ -44,8 +44,8 @@
   ];
 
   as_tests.forEach(item => {
-    create_test("{{host}}:{{ports[https][0]}}", item[0], {"site":"same-origin", "user":"", "mode": "cors"});
-    create_test("{{hosts[][www]}}:{{ports[https][0]}}", item[0], {"site":"same-site", "user":"", "mode": "cors"});
-    create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", item[0], {"site":"cross-site", "user":"", "mode": "cors"});
+    create_test("{{host}}:{{ports[https][0]}}", item[0], {"site":"same-origin", "user":"", "mode": "cors", "dest": item[1]});
+    create_test("{{hosts[][www]}}:{{ports[https][0]}}", item[0], {"site":"same-site", "user":"", "mode": "cors", "dest": item[1]});
+    create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", item[0], {"site":"cross-site", "user":"", "mode": "cors", "dest": item[1]});
   });
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html
index 0874273ef94f..827eb982e47f 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/redirect/cross-site-redirect.tentative.https.sub.html
@@ -15,18 +15,14 @@
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      let expected = {"site":"cross-site", "user":"", "mode": "no-cors"};
+      let expected = {"site":"cross-site", "user":"", "mode": "no-cors", "dest": "image"};
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Cross-Site -> Same-Origin redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Cross-Site -> Same-Origin redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -41,18 +37,14 @@
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      let expected = {"site":"cross-site", "user":"", "mode": "no-cors"};
+      let expected = {"site":"cross-site", "user":"", "mode": "no-cors", "dest": "image"};
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Cross-Site -> Same-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Cross-Site -> Same-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -67,18 +59,14 @@
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      let expected = {"site":"cross-site", "user":"", "mode": "no-cors"};
+      let expected = {"site":"cross-site", "user":"", "mode": "no-cors", "dest": "image"};
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Cross-Site -> Cross-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Cross-Site -> Cross-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html
index efff1cdaae84..fc986aaf4fdc 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-cross-site.tentative.https.sub.html
@@ -17,19 +17,15 @@
       e.src = "https://{{host}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// same-origin
       "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// cross-site
       "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;// same-origin
-      let expected = {"site":"cross-site", "user":"", "mode": "no-cors"};
+      let expected = {"site":"cross-site", "user":"", "mode": "no-cors", "dest": "image"};
 
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Origin -> Cross-Site -> Same-Origin redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Origin -> Cross-Site -> Same-Origin redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html
index e7774f6ba105..37b241516806 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html
@@ -16,10 +16,10 @@
   }
 </style>
 <body>
-    <div id="fontTest">Downgraded then upgraded font</div>
-    <script>
+<div id="fontTest">Downgraded then upgraded font</div>
+<script>
   let nonce = "{{$id}}";
-  let expected = { "site": "cross-site", "user": "", "mode": "cors" };
+  let expected = {"site": "cross-site", "user": "", "mode": "cors", "dest": ""};
 
   // Validate various scenarios handle a request that redirects from https => http
   // correctly and avoids disclosure of any Sec- headers.
@@ -29,39 +29,45 @@
     promise_test(t => {
       return new Promise((resolve, reject) => {
         let key = "font-https-downgrade-upgrade{{$id}}";
-        return fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
-          .then(_ => resolve())
-          .catch(e => reject(e));
+        return validate_expectations(key, expected, "Https downgrade-upgrade font => No headers")
+            .then(_ => resolve())
+            .catch(e => reject(e));
       });
     }, "Https downgrade-upgrade font => No headers");
   });
 
   promise_test(() => {
-    return requestViaImage(secureRedirectURL + encodeURIComponent(insecureRedirectURL + encodeURIComponent("https://{{host}}:{{ports[https][0]}}/common/security-features/subresource/image.py")))
-      .then(result => {
-         headers = result.headers;
-         got = {
-           "mode": headers["sec-fetch-mode"],
-           "site": headers["sec-fetch-site"],
-           "user": headers["sec-fetch-user"]
-         };
-         assert_header_equals(got, {
-           // Note that we're using `undefined` here, as opposed to "" elsewhere because of the way
-           // that `image.py` encodes data.
-           "site": "cross-site",
-           "user": undefined,
-           "mode": "cors",
-         });
-      });
+    return requestViaImage(secureRedirectURL + encodeURIComponent(
+        insecureRedirectURL + encodeURIComponent(
+        "https://{{host}}:{{ports[https][0]}}/common/security-features/subresource/image.py")))
+        .then(result => {
+          headers = result.headers;
+          got = {
+            "mode": headers["sec-fetch-mode"],
+            "site": headers["sec-fetch-site"],
+            "user": headers["sec-fetch-user"],
+            "dest": headers["sec-fetch-dest"]
+          };
+          assert_header_equals(got, {
+            // Note that we're using `undefined` here, as opposed to "" elsewhere because of the way
+            // that `image.py` encodes data.
+            "site": "cross-site",
+            "user": undefined,
+            "mode": "cors",
+            "dest": undefined
+          }, "Https downgrade-upgrade image => No headers");
+        });
   }, "Https downgrade-upgrade image => No headers");
 </script>
-<script src="https://{{host}}:{{ports[https][0]}}/fetch/api/resources/redirect.py?location=http%3A%2F%2F{{host}}%3A{{ports[http][0]}}%2Ffetch%2Fapi%2Fresources%2Fredirect.py%3Flocation%3Dhttps%253A%252F%252F{{host}}%253A{{ports[https][0]}}%252Ffetch%252Fmetadata%252Fresources%252Fecho-as-script.py"></script>
+<script
+    src="https://{{host}}:{{ports[https][0]}}/fetch/api/resources/redirect.py?location=http%3A%2F%2F{{host}}%3A{{ports[http][0]}}%2Ffetch%2Fapi%2Fresources%2Fredirect.py%3Flocation%3Dhttps%253A%252F%252F{{host}}%253A{{ports[https][0]}}%252Ffetch%252Fmetadata%252Fresources%252Fecho-as-script.py"></script>
 <script>
   test(t => {
-    t.add_cleanup(_ => { header = null; });
-    assert_header_equals(header, { "site": "cross-site", "user": "", "mode": "no-cors" });
+    t.add_cleanup(_ => {
+      header = null;
+    });
+    assert_header_equals(header, {"site": "cross-site", "user": "", "mode": "no-cors", "dest": ""},
+        "Https downgrade-upgrade script => No headers");
   }, "Https downgrade-upgrade script => No headers");
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html
index b1df738354cc..f5483ac3fa2f 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/redirect/multiple-redirect-same-site.tentative.https.sub.html
@@ -17,19 +17,15 @@
       e.src = "https://{{host}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// same-origin
       "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// same-site
       "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;// same-origin
-      let expected = {"site":"same-site", "user":"", "mode": "no-cors"};
+      let expected = {"site":"same-site", "user":"", "mode": "no-cors", "dest": "image"};
 
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected)
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected)
           .then(_ => resolve())
           .catch(e => reject(e));
       };
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html
index c7e1721af78b..c47190651e5c 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-http-upgrade.tentative.sub.html
@@ -19,7 +19,7 @@
     <div id="fontTest">Upgraded font</div>
     <script>
   let nonce = "{{$id}}";
-  let expected = { "site": "cross-site", "user": "", "mode": "cors" };
+  let expected = { "site": "cross-site", "user": "", "mode": "cors", "dest": "" };
 
   // Validate various scenarios handle a request that redirects from http => https correctly and add the proper Sec- headers.
   RunCommonRedirectTests("Http upgrade", upgradeRedirectTo, expected);
@@ -28,9 +28,7 @@
     promise_test(t => {
       return new Promise((resolve, reject) => {
         let key = "font-https-upgrade{{$id}}";
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Http upgrade font => No headers")
           .then(_ => resolve())
           .catch(e => reject(e));
       });
@@ -44,7 +42,8 @@
          got = {
            "mode": headers["sec-fetch-mode"],
            "site": headers["sec-fetch-site"],
-           "user": headers["sec-fetch-user"]
+           "user": headers["sec-fetch-user"],
+           "dest": headers["sec-fetch-dest"]
          };
          assert_header_equals(got, {
            // Note that we're using `undefined` here, as opposed to "" elsewhere because of the way
@@ -52,7 +51,8 @@
            "site": "cross-site",
            "user": undefined,
            "mode": "cors",
-         });
+           "dest": undefined,
+         }, "Http upgrade image => No headers");
       });
   }, "Http upgrade image => No headers");
 </script>
@@ -61,7 +61,7 @@
 <script>
   test(t => {
     t.add_cleanup(_ => { header = null; });
-    assert_header_equals(header, { "site": "cross-site", "user": "", "mode": "no-cors" });
+    assert_header_equals(header, { "site": "cross-site", "user": "", "mode": "no-cors", "dest": "" }, "Http upgrade script => No headers");
   }, "Http upgrade script => No headers");
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html
index 760ed3a2998f..9eb04822b683 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/redirect/redirect-https-downgrade.tentative.sub.html
@@ -19,7 +19,7 @@
   <div id="fontTest">Downgraded font</div>
   <script>
   let nonce = token();
-  let expected = { "site": "", "user": "", "mode": "" };
+  let expected = { "site": "", "user": "", "mode": "", "dest": "" };
 
   // Validate various scenarios handle a request that redirects from https => http correctly and avoids disclosure of any Sec- headers.
   RunCommonRedirectTests("Https downgrade", downgradeRedirectTo, expected);
@@ -30,7 +30,7 @@
         let key = "font-https-downgrade";
         fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
           .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+          .then(text => assert_no_headers(text, "Https downgrade font => No headers"))
           .then(_ => resolve())
           .catch(e => reject(e));
       });
@@ -44,7 +44,8 @@
          got = {
            "mode": headers["sec-fetch-mode"],
            "site": headers["sec-fetch-site"],
-           "user": headers["sec-fetch-user"]
+           "user": headers["sec-fetch-user"],
+           "dest": headers["sec-fetch-dest"]
          };
          assert_header_equals(got, {
            // Note that we're using `undefined` here, as opposed to "" elsewhere because of the way
@@ -52,7 +53,8 @@
            "site": undefined,
            "user": undefined,
            "mode": undefined,
-         });
+           "dest": undefined,
+         }, "Https downgrade image => No headers");
       });
   }, "Https downgrade image => No headers");
 </script>
@@ -61,7 +63,7 @@
 <script>
   test(t => {
     t.add_cleanup(_ => { header = null; });
-    assert_header_equals(header, { "site": "cross-site", "user": "", "mode": "no-cors" });
+    assert_no_headers(header, "Https downgrade script => No headers");
   }, "Https downgrade script => No headers");
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html
index a31d2d399f2c..38921a71314a 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/redirect/same-origin-redirect.tentative.https.sub.html
@@ -15,19 +15,15 @@
 
       let e = document.createElement('img');
       e.src = "/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      let expected = {"site":"same-origin", "user":"", "mode": "no-cors"};
+      let expected = {"site":"same-origin", "user":"", "mode": "no-cors", "dest": "image"};
 
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected)
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected)
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -42,19 +38,15 @@
 
       let e = document.createElement('img');
       e.src = "/xhr/resources/redirect.py?location=https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      let expected = {"site":"same-site", "user":"", "mode": "no-cors"};
+      let expected = {"site":"same-site", "user":"", "mode": "no-cors", "dest": "image"};
 
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Origin -> Same-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Origin -> Same-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -69,19 +61,15 @@
 
       let e = document.createElement('img');
       e.src = "/xhr/resources/redirect.py?location=https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      let expected = {"site":"cross-site", "user":"", "mode": "no-cors"};
+      let expected = {"site":"cross-site", "user":"", "mode": "no-cors", "dest": "image"};
 
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Origin -> Cross-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Origin -> Cross-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html
index f342b1c2669e..f8709a14c0f0 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/redirect/same-site-redirect.tentative.https.sub.html
@@ -15,19 +15,15 @@
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      let expected = {"site":"same-site", "user":"", "mode": "no-cors"};
+      let expected = {"site":"same-site", "user":"", "mode": "no-cors", "dest": "image"};
 
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Site -> Same-Origin redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Site -> Same-Origin redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -42,19 +38,15 @@
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      let expected = {"site":"same-site", "user":"", "mode": "no-cors"};
+      let expected = {"site":"same-site", "user":"", "mode": "no-cors", "dest": "image"};
 
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Site -> Same-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Site -> Same-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -69,19 +61,15 @@
 
       let e = document.createElement('img');
       e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      let expected = {"site":"cross-site", "user":"", "mode": "no-cors"};
+      let expected = {"site":"cross-site", "user":"", "mode": "no-cors", "dest": "image"};
 
       e.onload = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Site -> Cross-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
       e.onerror = e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Site -> Cross-Site redirect")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/report.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/report.tentative.https.sub.html
index 821c56f5877a..b0131fee97d8 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/report.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/report.tentative.https.sub.html
@@ -10,9 +10,7 @@
   function generate_test(expected, name) {
     async_test(t => {
       t.step_timeout(_ => {
-        return fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=report-" + name)
-            .then(response => response.text())
-            .then(text => assert_header_equals(text, expected))
+        return validate_expectations("report-" + name, expected, name + " report")
             .then(_ => t.done());
       }, 1000);
     }, name + " report");
@@ -22,9 +20,9 @@
   document.addEventListener("securitypolicyviolation", (e) => {
     counter++;
     if (counter == 3) {
-      generate_test({"site":"same-origin", "user":"", "mode": "no-cors"}, "same-origin");
-      generate_test({"site":"same-site", "user":"", "mode": "no-cors"}, "same-site");
-      generate_test({"site":"cross-site", "user":"", "mode": "no-cors"}, "cross-site");
+      generate_test({"site":"same-origin", "user":"", "mode": "no-cors", "dest": "report"}, "same-origin");
+      generate_test({"site":"same-site", "user":"", "mode": "no-cors", "dest": "report"}, "same-site");
+      generate_test({"site":"cross-site", "user":"", "mode": "no-cors", "dest": "report"}, "cross-site");
 
       done();
     }
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/helper.js b/tests/wpt/web-platform-tests/fetch/metadata/resources/helper.js
index d9b00ed8b94b..a344c94106a1 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/resources/helper.js
+++ b/tests/wpt/web-platform-tests/fetch/metadata/resources/helper.js
@@ -13,7 +13,20 @@ function validate_expectations(key, expected, tag) {
       test(t => assert_equals(value.site, expected.site), `${tag}: sec-fetch-site`);
       test(t => assert_equals(value.user, expected.user), `${tag}: sec-fetch-user`);
     });
-};
+}
+
+function validate_expectations_custom_url(url, header, expected, tag) {
+  return fetch(url, header)
+    .then(response => response.text())
+    .then(text => {
+      assert_not_equals(text, "No header has been recorded");
+      let value = JSON.parse(text);
+      test(t => assert_equals(value.dest, expected.dest), `${tag}: sec-fetch-dest`);
+      test(t => assert_equals(value.mode, expected.mode), `${tag}: sec-fetch-mode`);
+      test(t => assert_equals(value.site, expected.site), `${tag}: sec-fetch-site`);
+      test(t => assert_equals(value.user, expected.user), `${tag}: sec-fetch-user`);
+    });
+}
 
 /**
  * @param {object} value
@@ -26,61 +39,25 @@ function assert_header_equals(value, expected, tag) {
     value = JSON.parse(value);
   }
 
-  assert_equals(value.mode, expected.mode, wrap_by_tag(tag, "mode"));
-  assert_equals(value.site, expected.site, wrap_by_tag(tag, "site"));
-  if (expected.hasOwnProperty("user"))
-    assert_equals(value.user, expected.user, wrap_by_tag(tag, "user"));
+  test(t => assert_equals(value.dest, expected.dest), `${tag}: sec-fetch-dest`);
+  test(t => assert_equals(value.mode, expected.mode), `${tag}: sec-fetch-mode`);
+  test(t => assert_equals(value.site, expected.site), `${tag}: sec-fetch-site`);
+  test(t => assert_equals(value.user, expected.user), `${tag}: sec-fetch-user`);
 }
 
 /**
- * @param {string} header
  * @param {object} value
- * @param {string} expected
  * @param {string} tag
  **/
-function assert_header(header, value, expected, tag) {
+function assert_no_headers(value, tag) {
   if (typeof(value) === "string"){
-    assert_not_equals(value, "No header has been recorded");
+    if (value == "No header has been recorded") return;
     value = JSON.parse(value);
   }
 
-  assert_equals(value[header], expected, wrap_by_tag(tag, header));
-}
-
-/**
- *
- * @param {object} value
- * @param {string} expected
- * @param {string} tag
- **/
-function assert_header_dest_equals(value, expected, tag) {
-  assert_header("dest", value, expected, tag);
-}
-
-/**
- * Test fetch record-header.py
- * @param {string} key
- * @param {string} expected
- * @param {function} assert
- * @return {Promise<string | never>}
- */
-function fetch_record_header(key, expected, assert) {
-  return fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-      .then(response => response.text())
-      .then(text => assert(text, expected))
-}
-
-/**
- *
- * @param {string} key
- * @param {string} expected
- * @param {function} assert
- * @param {function} resolve
- * @param {function} reject
- * @return {Promise<any>}
- */
-function fetch_record_header_with_catch(key, expected, assert, resolve, reject) {
-  return fetch_record_header(key, expected, assert, resolve)
-      .then(_ => resolve())
-      .catch(e => reject(e));
+  test(t => assert_equals(value.mode, ""), `${tag}: sec-fetch-mode`);
+  test(t => assert_equals(value.site, ""), `${tag}: sec-fetch-site`);
+  if (expected.hasOwnProperty("user"))
+    test(t => assert_equals(value.user, ""), `${tag}: sec-fetch-user`);
+  test(t => assert_equals(value.dest, ""), `${tag}: sec-fetch-dest`);
 }
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/redirectTestHelper.sub.js b/tests/wpt/web-platform-tests/fetch/metadata/resources/redirectTestHelper.sub.js
index 2764c07030c1..c40b5a5e17ef 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/resources/redirectTestHelper.sub.js
+++ b/tests/wpt/web-platform-tests/fetch/metadata/resources/redirectTestHelper.sub.js
@@ -50,8 +50,8 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
       }
       let expectation = { ...expectedResults };
       if (expectation['mode'] != '')
-        expectation['mode'] = 'nested-navigate';
-      assert_header_equals(e.data, expectation);
+        expectation['mode'] = 'navigate';
+      assert_header_equals(e.data, expectation, testNamePrefix + ' iframe');
       t.done();
     }));
 
@@ -69,7 +69,7 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
       let expectation = { ...expectedResults };
       if (expectation['mode'] != '')
         expectation['mode'] = 'navigate';
-      assert_header_equals(e.data, expectation);
+      assert_header_equals(e.data, expectation, testNamePrefix + ' top level navigation');
       t.done();
     }));
   }, testNamePrefix + ' top level navigation');
@@ -82,10 +82,10 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
       e.onload = e => {
         let expectation = { ...expectedResults };
         if (expectation['mode'] != '')
-          expectation['mode'] = 'no-cors';
+          expectation['mode'] = 'navigate';
         fetch('/fetch/metadata/resources/record-header.py?retrieve=true&file=' + key)
           .then(response => response.text())
-          .then(t.step_func(text => assert_header_equals(text, expectation)))
+          .then(t.step_func(text => assert_header_equals(text, expectation, testNamePrefix + ' embed')))
           .then(resolve)
           .catch(e => reject(e));
       };
@@ -98,9 +98,11 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
     let expectation = { ...expectedResults };
     if (expectation['mode'] != '')
       expectation['mode'] = 'cors';
+    if (expectation['dest'] == '' && testNamePrefix != "Https downgrade")
+      expectation['dest'] = 'empty';
     return fetch(urlHelperMethod('resources/echo-as-json.py?' + key))
       .then(r => r.json())
-      .then(j => {assert_header_equals(j, expectation);});
+      .then(j => {assert_header_equals(j, expectation, testNamePrefix + ' fetch() api');});
   }, testNamePrefix + ' fetch() api');
 
   promise_test(t => {
@@ -111,10 +113,10 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
       e.onload = e => {
         let expectation = { ...expectedResults };
         if (expectation['mode'] != '')
-          expectation['mode'] = 'no-cors';
+          expectation['mode'] = 'navigate';
         fetch('/fetch/metadata/resources/record-header.py?retrieve=true&file=' + key)
           .then(response => response.text())
-          .then(t.step_func(text => assert_header_equals(text, expectation)))
+          .then(t.step_func(text => assert_header_equals(text, expectation, testNamePrefix + ' object')))
           .then(resolve)
           .catch(e => reject(e));
       };
@@ -135,7 +137,7 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
           expectation['mode'] = 'cors';
         fetch('/fetch/metadata/resources/record-header.py?retrieve=true&file=' + key)
           .then(t.step_func(response => response.text()))
-          .then(t.step_func_done(text => assert_header_equals(text, expectation)))
+          .then(t.step_func_done(text => assert_header_equals(text, expectation, testNamePrefix + ' prefetch => No headers')))
           .catch(t.unreached_func('Fetching and verifying the results should succeed.'));
       });
       e.onerror = t.unreached_func();
@@ -156,7 +158,7 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
           expectation['mode'] = 'cors';
         fetch('/fetch/metadata/resources/record-header.py?retrieve=true&file=' + key)
           .then(t.step_func(response => response.text()))
-          .then(t.step_func_done(text => assert_header_equals(text, expectation)))
+          .then(t.step_func_done(text => assert_header_equals(text, expectation, testNamePrefix + ' preload')))
           .catch(t.unreached_func());
       });
       document.head.appendChild(e);
@@ -175,7 +177,7 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
           expectation['mode'] = 'no-cors';
         fetch('/fetch/metadata/resources/record-header.py?retrieve=true&file=' + key)
           .then(response => response.text())
-          .then(t.step_func(text => assert_header_equals(text, expectation)))
+          .then(t.step_func(text => assert_header_equals(text, expectation, testNamePrefix + ' stylesheet')))
           .then(resolve)
           .catch(e => reject(e));
       };
@@ -195,7 +197,7 @@ function RunCommonRedirectTests(testNamePrefix, urlHelperMethod, expectedResults
           expectation['mode'] = 'cors';
         fetch('/fetch/metadata/resources/record-header.py?retrieve=true&file=' + key)
           .then(response => response.text())
-          .then(t.step_func(text => assert_header_equals(text, expectedResults)))
+          .then(t.step_func(text => assert_header_equals(text, expectedResults, testNamePrefix + ' track')))
           .then(resolve);
       });
       video.appendChild(el);
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/xslt-test.sub.xml b/tests/wpt/web-platform-tests/fetch/metadata/resources/xslt-test.sub.xml
index 6a05633c9e4d..acb478ab6414 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/resources/xslt-test.sub.xml
+++ b/tests/wpt/web-platform-tests/fetch/metadata/resources/xslt-test.sub.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=xslt-same-origin{{GET[token]}}" type="text/xsl" ?>
-<?xml-stylesheet href="https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=xslt-same-site{{GET[token]}}" type="text/xsl" ?>
-<?xml-stylesheet href="https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=xslt-cross-site{{GET[token]}}" type="text/xsl" ?>
+<!-- Only testing same-origin XSLT because same-site and cross-site XSLT is blocked. -->
 
 <!-- postMessage parent back when the resources are loaded -->
 <script xmlns="http://www.w3.org/1999/xhtml"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/script.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/script.tentative.https.sub.html
index d5a1096e8198..f66f66343344 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/script.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/script.tentative.https.sub.html
@@ -13,7 +13,8 @@
       "site": "same-origin",
       "user": "",
       "mode": "no-cors",
-    });
+      "dest": "script"
+    }, "Same-origin script");
   }, "Same-origin script");
 </script>
 
@@ -27,7 +28,8 @@
       "site": "same-site",
       "user": "",
       "mode": "no-cors",
-    });
+      "dest": "script"
+    }, "Same-site script");
   }, "Same-site script");
 </script>
 
@@ -41,7 +43,8 @@
       "site": "cross-site",
       "user": "",
       "mode": "no-cors",
-    });
+      "dest": "script"
+    }, "Cross-site script");
   }, "Cross-site script");
 </script>
 
@@ -55,6 +58,7 @@
       "site": "same-origin",
       "user": "",
       "mode": "cors",
-    });
+      "dest": "script"
+    }, "Same-origin CORS script");
   }, "Same-origin CORS script");
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/script.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/script.tentative.sub.html
index b1361516cb53..9d6059abc177 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/script.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/script.tentative.sub.html
@@ -13,7 +13,8 @@
       "site": "",
       "user": "",
       "mode": "",
-    });
+      "dest": ""
+    }, "Non-secure same-origin script => No headers");
   }, "Non-secure same-origin script => No headers");
 </script>
 
@@ -27,7 +28,8 @@
       "site": "",
       "user": "",
       "mode": "",
-    });
+      "dest": ""
+    }, "Non-secure same-site script => No headers");
   }, "Non-secure same-site script => No headers");
 </script>
 
@@ -41,6 +43,7 @@
       "site": "",
       "user": "",
       "mode": "",
-    });
+      "dest": ""
+    }, "Non-secure cross-site script => No headers");
   }, "Non-secure cross-site script => No headers");
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html
deleted file mode 100644
index 469001e2f338..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/appcache.tentative.https.sub.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html manifest="/fetch/metadata/resources/record-header.py?file=appcache-manifest{{$id:uuid()}}">
-<meta name="timeout" content="long">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body></body>
-<script>
-  async_test(t => {
-    window.applicationCache.oncached = window.applicationCache.onnoupdate = window.applicationCache.onerror = t.step_func(e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=appcache-manifest{{$id}}")
-          .then(t.step_func(response => response.text()))
-          .then(t.step_func_done(text => assert_header_dest_equals(text, "")))
-          .catch(t.unreached_func("Fetching and verifying the results should succeed."));
-});
-}, "Appcache!");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html
deleted file mode 100644
index d880deee5dd9..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/embed.tentative.https.sub.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8"/>
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body>
-<script>
-  let nonce = token();
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "embed-same-origin" + nonce;
-
-      let e = document.createElement('embed');
-      e.src = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "embed", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Origin embed");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "embed-same-site" + nonce;
-
-      let e = document.createElement('embed');
-      e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "embed", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Site embed");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "embed-cross-site" + nonce;
-
-      let e = document.createElement('embed');
-      e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "embed", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Cross-Site embed");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html
deleted file mode 100644
index 63d53e8969da..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-preflight.tentative.https.sub.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script>
-  // Site
-  promise_test(t => {
-    return fetch("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py",
-                 {
-                   mode: "cors",
-                   headers: { 'x-test': 'testing' }
-                 })
-        .then(r => r.json())
-        .then(j => assert_header_dest_equals(j, "empty"));
-  }, "Same-site fetch with preflight");
-
-  promise_test(t => {
-    return fetch("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py",
-                 {
-                   mode: "cors",
-                   headers: { 'x-test': 'testing' }
-                 })
-        .then(r => r.json())
-        .then(j => assert_header_dest_equals(j, "empty"));
-  }, "Cross-site fetch with preflight");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html
deleted file mode 100644
index d2341572eb79..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--fallback.tentative.https.sub.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<!--
-  This test verifies presence of Sec-Fetch-... request headers on a request
-  handled by a service worker - this test covers the scenario when the service
-  worker doesn't do anything and the request falls back to the network.
--->
-<meta charset="utf-8"/>
-<link rel="author" href="lukasza@chromium.org" title="Lukasz Anforowicz">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/service-workers/service-worker/resources/test-helpers.sub.js></script>
-<script src=/common/utils.js></script>
-<script>
-    const nonce = token();
-    const key = "fetch-via-serviceworker--fallback--" + nonce;
-
-    promise_test(async function(t) {
-        const SCOPE = '/fetch/metadata/resources/fetch-via-serviceworker--fallback--frame.html';
-        const SCRIPT = '/fetch/metadata/resources/fetch-via-serviceworker--fallback--sw.js';
-        const URL = '/fetch/metadata/resources/record-header.py?file=' + key;
-        const RETRIEVAL_URL = "/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key;
-
-        const reg = await service_worker_unregister_and_register(t, SCRIPT, SCOPE);
-        t.add_cleanup(async () => {
-          if (reg)
-            await reg.unregister();
-        });
-
-        await wait_for_state(t, reg.installing, 'activated');
-
-        const frame = await with_iframe(SCOPE);
-        t.add_cleanup(async () => {
-          if (frame)
-            frame.remove();
-        });
-
-        // Trigger a fetch that 1) will go through the service worker and 2) will
-        // fetch a special URL that records request headers.
-        await frame.contentWindow.fetch(URL, {mode:'no-cors'});
-
-        // Retrieve the request headers that have been recorded in the previous step.
-        const response = await fetch(RETRIEVAL_URL);
-        const text = await response.text();
-
-        // Verify presence of the expected Sec-Fetch-... request headers.
-        assert_header_dest_equals(text, "empty");
-      }, 'Sec-Fetch headers after SW fallback');
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html
deleted file mode 100644
index f70ae8b9dd3a..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch-via-serviceworker--respondWith.tentative.https.sub.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<!--
-  This test verifies presence of Sec-Fetch-... request headers on a request
-  handled by a service worker - this test covers the scenario when the service
-  worker responds to the `fetch` event with:
-      event.respondWith(fetch(event.request));
--->
-<meta charset="utf-8"/>
-<link rel="author" href="lukasza@chromium.org" title="Lukasz Anforowicz">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/service-workers/service-worker/resources/test-helpers.sub.js></script>
-<script src=/common/utils.js></script>
-<script>
-    const nonce = token();
-    const key = "fetch-via-serviceworker--respondWith--" + nonce;
-
-    promise_test(async function(t) {
-        const SCOPE = '/fetch/metadata/resources/fetch-via-serviceworker--respondWith--frame.html';
-        const SCRIPT = '/fetch/metadata/resources/fetch-via-serviceworker--respondWith--sw.js';
-        const URL = '/fetch/metadata/resources/record-header.py?file=' + key;
-        const RETRIEVAL_URL = "/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key;
-
-        const reg = await service_worker_unregister_and_register(t, SCRIPT, SCOPE);
-        t.add_cleanup(async () => {
-          if (reg)
-            await reg.unregister();
-        });
-
-        await wait_for_state(t, reg.installing, 'activated');
-
-        const frame = await with_iframe(SCOPE);
-        t.add_cleanup(async () => {
-          if (frame)
-            frame.remove();
-        });
-
-        // Trigger a fetch that 1) will go through the service worker and 2) will
-        // fetch a special URL that records request headers.
-        await frame.contentWindow.fetch(URL, {mode:'no-cors'});
-
-        // Retrieve the request headers that have been recorder in the previous step.
-        const response = await fetch(RETRIEVAL_URL);
-        const text = await response.text();
-
-        // Verify presence of the expected Sec-Fetch-... request headers.
-        assert_header_dest_equals(text, "empty");
-      }, 'Sec-Fetch headers after SW fallback');
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html
deleted file mode 100644
index 99f8191d7cb9..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch.tentative.https.sub.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script>
-  // Site
-  promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => assert_header_dest_equals(j, "empty"));
-  }, "Same-origin fetch");
-
-  promise_test(t => {
-    return fetch("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => assert_header_dest_equals(j, "empty"));
-  }, "Same-site fetch");
-
-  promise_test(t => {
-    return fetch("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => assert_header_dest_equals(j, "empty"));
-  }, "Cross-site fetch");
-
-  // Mode
-  promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "same-origin"})
-        .then(r => r.json())
-        .then(j => assert_header_dest_equals(j, "empty"));
-  }, "Same-origin mode");
-
-  promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "cors"})
-        .then(r => r.json())
-        .then(j => assert_header_dest_equals(j, "empty"));
-  }, "CORS mode");
-
-  promise_test(t => {
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {mode: "no-cors"})
-        .then(r => r.json())
-        .then(j => assert_header_dest_equals(j, "empty"));
-  }, "no-CORS mode");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html
deleted file mode 100644
index cf6c7977af22..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/fetch.tentative.sub.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script>
-  // http -> https should see `Sec-Fetch-Site: cross-site`.
-  // This is a regression test for
-  // https://github.com/w3c/webappsec-fetch-metadata/issues/34
-  promise_test(t => {
-    assert_equals(location.protocol, "http:");
-    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => assert_header_dest_equals(j, "empty"));
-  }, "http->https fetch (cross-scheme => cross-site)");
-
-  // http -> http should see no `Sec-Fetch-Site`.
-  promise_test(t => {
-    assert_equals(location.protocol, "http:");
-    return fetch("/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => assert_header_dest_equals(j, ""));
-  }, "http->http fetch (non-trustworthy destination => no metadata)");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html
deleted file mode 100644
index bc892db320c2..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/font.tentative.https.sub.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html>
-<html>
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<body>
-  <div id="test1">1</div>
-  <div id="test2">2</div>
-  <div id="test3">3</div>
-  <!-- Same-Origin request -->
-  <style>
-    @font-face {
-      font-family: myFirstFont;
-      src: url(https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=font-same-origin);
-    }
-    #test1 {
-      font-family: myFirstFont;
-    }
-  </style>
-
-  <!-- Same-Site request -->
-  <style>
-    @font-face {
-      font-family: mySecondFont;
-      src: url(https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=font-same-site);
-    }
-    #test2 {
-      font-family: mySecondFont;
-    }
-  </style>
-
-  <!-- Cross-Site request -->
-  <style>
-    @font-face {
-      font-family: myThirdFont;
-      src: url(https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=font-cross-site);
-    }
-    #test3 {
-      font-family: myThirdFont;
-    }
-  </style>
-</body>
-<script>
-  document.fonts.ready.then(function () {
-    promise_test(t => {
-      return new Promise((resolve, reject) => {
-        let key = "font-same-origin";
-        fetch_record_header_with_catch(key, "font", assert_header_dest_equals, resolve, reject);
-        });
-    }, "Same-Origin font");
-
-    promise_test(t => {
-      return new Promise((resolve, reject) => {
-        let key = "font-same-site";
-        fetch_record_header_with_catch(key, "font", assert_header_dest_equals, resolve, reject);
-        });
-    }, "Same-Site font");
-
-    promise_test(t => {
-      return new Promise((resolve, reject) => {
-        let key = "font-cross-site";
-        fetch_record_header_with_catch(key, "font", assert_header_dest_equals, resolve, reject);
-        });
-    }, "Cross-Site font");
-
-  });
-</script>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html
deleted file mode 100644
index d80b72746985..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/frame.tentative.https.sub.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/testdriver.js></script>
-<script src=/resources/testdriver-vendor.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body>
-<script>
-  const USER = true;
-  const FORCED = false;
-
-  function create_test(host, user_activated, expectations) {
-    async_test(t => {
-      let i = document.createElement('frame');
-      window.addEventListener('message', t.step_func(e => {
-        if (e.source != i.contentWindow)
-          return;
-
-        assert_header_dest_equals(e.data, expectations);
-        t.done();
-      }));
-
-      let url = `https://${host}/fetch/metadata/resources/post-to-owner.py`;
-      if (user_activated == FORCED) {
-        i.src = url;
-        document.body.appendChild(i);
-      } else if (user_activated == USER) {
-        let uuid = token();
-        i.name = uuid;
-        let a = document.createElement('a');
-        a.href = url;
-        a.target = uuid;
-        a.text = "This is a link!";
-
-        document.body.appendChild(i);
-        document.body.appendChild(a);
-
-        test_driver.click(a);
-      }
-    }, `{{host}} -> ${host} iframe: ${user_activated ? "user-activated" : "forced"}`);
-  }
-
-  create_test("{{host}}:{{ports[https][0]}}", FORCED, "frame");
-
-  create_test("{{hosts[][www]}}:{{ports[https][0]}}", FORCED, "frame");
-
-  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", FORCED, "frame");
-
-  create_test("{{host}}:{{ports[https][0]}}", USER, "frame");
-
-  create_test("{{hosts[][www]}}:{{ports[https][0]}}", USER, "frame");
-
-  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", USER, "frame");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html
deleted file mode 100644
index 61b6d1f446be..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/frame.tentative.sub.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<body>
-<script>
-  async_test(t => {
-    let i = document.createElement('frame');
-    i.src = "http://{{host}}:{{ports[http][0]}}/fetch/metadata/resources/post-to-owner.py";
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != i.contentWindow)
-        return;
-
-      assert_header_dest_equals(e.data, "");
-      t.done();
-    }));
-
-    document.body.appendChild(i);
-  }, "Non-secure same-origin iframe => No headers");
-
-  async_test(t => {
-    let i = document.createElement('frame');
-    i.src = "http://{{hosts[][www]}}:{{ports[http][0]}}/fetch/metadata/resources/post-to-owner.py";
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != i.contentWindow)
-        return;
-
-      assert_header_dest_equals(e.data, "");
-      t.done();
-    }));
-
-    document.body.appendChild(i);
-  }, "Non-secure same-site iframe => No headers");
-
-  async_test(t => {
-    let i = document.createElement('frame');
-    i.src = "http://{{hosts[alt][www]}}:{{ports[http][0]}}/fetch/metadata/resources/post-to-owner.py";
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != i.contentWindow)
-        return;
-
-      assert_header_dest_equals(e.data, "");
-      t.done();
-    }));
-
-    document.body.appendChild(i);
-  }, "Non-secure cross-site iframe => No headers.");
-
-  async_test(t => {
-    let i = document.createElement('frame');
-    i.src = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py";
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != i.contentWindow)
-        return;
-
-      assert_header_dest_equals(e.data, "frame");
-      t.done();
-    }));
-
-    document.body.appendChild(i);
-  }, "Secure, cross-site (cross-scheme, same-host) frame");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html
deleted file mode 100644
index 55e03a23660b..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/history.tentative.https.sub.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script>
-
-// Test that correct `Sec-Fetch-Site` (and other `Sec-Fetch-...` request
-/// headers) are used in navigations triggered by |history.back()|.
-function add_test(description, report_host, go_back_host, expectation) {
-  async_test(t => {
-    // STEP1: Navigate a new window to report_host/post-to-owner.py
-    const url_suffix = '/fetch/metadata/resources/post-to-owner.py'
-    const url = `https://${report_host}${url_suffix}`;
-    const w = window.open(url, '_blank');
-
-    var msg_counter = 0;
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != w)
-        return;
-      msg_counter = msg_counter + 1;
-      if (msg_counter == 1) {
-        // STEP2: Verify the headers (this is a sanity check that the same
-        // headers are used here and in STEP5).
-        assert_header_dest_equals(e.data, expectation);
-
-        // STEP3: Go to go_back_host/go-back.html (postponing this via
-        // step_timeout ensures that go-back.html will get a separate
-        // history entry - otherwise it might be treated as a client-side
-        // redirect and we might end up with nowhere to go back to).
-        t.step_timeout(() => {
-          const url_suffix = '/fetch/metadata/resources/go-back.html'
-          const url = `https://${go_back_host}${url_suffix}`;
-          w.location = url;
-        });
-
-        // STEP4 (elsewhere - inside go-back.html): Call history.back().
-      } else if (msg_counter == 2) {
-        // STEP5: Verify the headers (this is the main verification and focus
-        // of the test).
-        assert_header_dest_equals(e.data, expectation);
-
-        // STEP6: Finish the test.
-        t.done();
-      }
-    }));
-  }, description);
-}
-
-const same_origin_host = "{{host}}:{{ports[https][0]}}";
-const same_site_host = "{{hosts[][www]}}:{{ports[https][0]}}";
-const cross_site_host = "{{hosts[alt][www]}}:{{ports[https][0]}}";
-
-add_test(
-  "back to same-origin-initiated navigation",
-  same_origin_host,  // report_host
-  cross_site_host,  // go_back_host
-  "document");
-
-add_test(
-  "back to same-site-initiated navigation",
-  same_site_host,  // report_host
-  cross_site_host,  // go_back_host
-  "document");
-
-add_test(
-  "back to cross-site-initiated navigation",
-  cross_site_host,  // report_host
-  cross_site_host,  // go_back_host
-  "document");
-
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html
deleted file mode 100644
index 356805d19002..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/iframe.tentative.https.sub.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/testdriver.js></script>
-<script src=/resources/testdriver-vendor.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body>
-<script>
-  const USER = true;
-  const FORCED = false;
-
-  function create_test(host, user_activated, expectations) {
-    async_test(t => {
-      let i = document.createElement('iframe');
-      window.addEventListener('message', t.step_func(e => {
-        if (e.source != i.contentWindow)
-          return;
-
-        assert_header_dest_equals(e.data, expectations);
-        t.done();
-      }));
-
-      let url = `https://${host}/fetch/metadata/resources/post-to-owner.py`;
-      if (user_activated == FORCED) {
-        i.src = url;
-        document.body.appendChild(i);
-      } else if (user_activated == USER) {
-        let uuid = token();
-        i.name = uuid;
-        let a = document.createElement('a');
-        a.href = url;
-        a.target = uuid;
-        a.text = "This is a link!";
-
-        document.body.appendChild(i);
-        document.body.appendChild(a);
-
-        test_driver.click(a);
-      }
-    }, `{{host}} -> ${host} iframe: ${user_activated ? "user-activated" : "forced"}`);
-  }
-
-  create_test("{{host}}:{{ports[https][0]}}", FORCED, "iframe");
-
-  create_test("{{hosts[][www]}}:{{ports[https][0]}}", FORCED, "iframe");
-
-  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", FORCED, "iframe");
-
-  create_test("{{host}}:{{ports[https][0]}}", USER, "iframe");
-
-  create_test("{{hosts[][www]}}:{{ports[https][0]}}", USER, "iframe");
-
-  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", USER, "iframe");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html
deleted file mode 100644
index e126e3c0a891..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/iframe.tentative.sub.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<body>
-<script>
-  async_test(t => {
-    let i = document.createElement('iframe');
-    i.src = "http://{{host}}:{{ports[http][0]}}/fetch/metadata/resources/post-to-owner.py";
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != i.contentWindow)
-        return;
-
-      assert_header_dest_equals(e.data, "");
-      t.done();
-    }));
-
-    document.body.appendChild(i);
-  }, "Non-secure same-origin iframe => No headers");
-
-  async_test(t => {
-    let i = document.createElement('iframe');
-    i.src = "http://{{hosts[][www]}}:{{ports[http][0]}}/fetch/metadata/resources/post-to-owner.py";
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != i.contentWindow)
-        return;
-
-      assert_header_dest_equals(e.data, "");
-      t.done();
-    }));
-
-    document.body.appendChild(i);
-  }, "Non-secure same-site iframe => No headers");
-
-  async_test(t => {
-    let i = document.createElement('iframe');
-    i.src = "http://{{hosts[alt][www]}}:{{ports[http][0]}}/fetch/metadata/resources/post-to-owner.py";
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != i.contentWindow)
-        return;
-
-      assert_header_dest_equals(e.data, "");
-      t.done();
-    }));
-
-    document.body.appendChild(i);
-  }, "Non-secure cross-site iframe => No headers.");
-
-  async_test(t => {
-    let i = document.createElement('iframe');
-    i.src = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py";
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != i.contentWindow)
-        return;
-
-      assert_header_dest_equals(e.data, "iframe");
-      t.done();
-    }));
-
-    document.body.appendChild(i);
-  }, "Secure, cross-site (cross-scheme, same-host) iframe");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html
deleted file mode 100644
index f6b84b1795b4..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/img.tentative.https.sub.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/common/security-features/resources/common.sub.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<body>
-<script>
-  // These tests reuse the `referrer-policy` infrastructure to load images that
-  // encode their request headers in their pixels. Fun stuff!
-  promise_test(() =>
-    requestViaImage(
-      "https://{{host}}:{{ports[https][0]}}/common/security-features/subresource/image.py")
-    .then(result => {
-        headers = result.headers;
-        got = {
-          "dest": headers["sec-fetch-dest"]
-        };
-        assert_header_dest_equals(got, "image");
-      }),
-    "Same-origin image");
-
-  promise_test(() =>
-    requestViaImage(
-      "https://{{hosts[][www]}}:{{ports[https][0]}}/common/security-features/subresource/image.py")
-    .then(result => {
-        headers = result.headers;
-        got = {
-          "dest": headers["sec-fetch-dest"]
-        };
-        assert_header_dest_equals(got, "image");
-      }),
-    "Same-site image");
-
-  promise_test(() =>
-    requestViaImage(
-      "https://{{hosts[alt][www]}}:{{ports[https][0]}}/common/security-features/subresource/image.py")
-    .then(result => {
-        headers = result.headers;
-        got = {
-          "dest": headers["sec-fetch-dest"]
-        };
-        assert_header_dest_equals(got, "image");
-      }),
-    "Cross-site image");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/navigation.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/navigation.https.sub.html
deleted file mode 100644
index 3ab843d165c0..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/navigation.https.sub.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script>
-  test(t => {
-    let actual = {
-      "dest": "{{headers[sec-fetch-dest]}}"
-    };
-
-    assert_header_dest_equals(actual, "document");
-  }, "This page's top-level navigation.");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html
deleted file mode 100644
index 29db51117858..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/object.tentative.https.sub.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8"/>
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body>
-<script>
-  let nonce = token();
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "object-same-origin" + nonce;
-
-      let e = document.createElement('object');
-      e.data = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "object", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Origin object");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "object-same-site" + nonce;
-
-      let e = document.createElement('object');
-      e.data = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "object", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Site object");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "object-cross-site" + nonce;
-
-      let e = document.createElement('object');
-      e.data = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "object", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Cross-Site object");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/portal.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/portal.tentative.https.sub.html
deleted file mode 100644
index ad9e8fd93623..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/portal.tentative.https.sub.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/testdriver.js></script>
-<script src=/resources/testdriver-vendor.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body>
-<script>
-  const USER = true;
-  const FORCED = false;
-
-  function create_test(host, expectation) {
-    async_test(t => {
-      let p = document.createElement('portal');
-      p.addEventListener('message', t.step_func(e => {
-        assert_header_dest_equals(e.data, expectation);
-        t.done();
-      }));
-
-      let url = `https://${host}/fetch/metadata/resources/post-to-owner.py`;
-      p.src = url;
-      document.body.appendChild(p);
-    }, `{{host}} -> ${host} portal`);
-  }
-
-  // TODO(mkwst): 'document' seems right, I guess? Perhaps a portal-specific destination would be better?
-  create_test("{{host}}:{{ports[https][0]}}", "document");
-
-  create_test("{{hosts[][www]}}:{{ports[https][0]}}", "document");
-
-  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", "document");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html
deleted file mode 100644
index be495ba332ec..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/prefetch.tentative.https.sub.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body></body>
-<script>
-  test(t => {
-    assert_true(document.createElement('link').relList.supports('prefetch'));
-  }, "Browser supports prefetch.");
-
-  function create_test(host, expected) {
-    async_test(t => {
-      let nonce = token();
-      let key = "prefetch" + nonce;
-
-      let e = document.createElement('link');
-      e.rel = "prefetch";
-      e.href = `https://${host}/fetch/metadata/resources/record-header.py?file=${key}`;
-      e.setAttribute("crossorigin", "crossorigin");
-      e.onload = t.step_func(e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(t.step_func(response => response.text()))
-          .then(t.step_func_done(text => assert_header_dest_equals(text, expected)))
-          .catch(t.unreached_func("Fetching and verifying the results should succeed."));
-      });
-      e.onerror = t.unreached_func();
-
-      document.head.appendChild(e);
-    }, `<link rel='prefetch' href='https://${host}/...'>`);
-  }
-
-  create_test("{{host}}:{{ports[https][0]}}", "empty");
-  create_test("{{hosts[][www]}}:{{ports[https][0]}}", "empty");
-  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", "empty");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html
deleted file mode 100644
index 2c82abb36640..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/preload.tentative.https.sub.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<meta name="timeout" content="long">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body></body>
-<script>
-  test(t => {
-    assert_true(document.createElement('link').relList.supports('preload'));
-  }, "Browser supports preload.");
-
-  function create_test(host, as, expected) {
-    async_test(t => {
-      let nonce = "{{uuid()}}";
-      let key = as + nonce;
-
-      let e = document.createElement('link');
-      e.rel = "preload";
-      e.href = `https://${host}/fetch/metadata/resources/record-header.py?file=${key}`;
-      e.setAttribute("crossorigin", "crossorigin");
-      if (as !== undefined) {
-        e.setAttribute("as", as);
-      }
-      e.onload = e.onerror = t.step_func_done(e => {
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(t.step_func(response => response.text()))
-          .then(t.step_func(text => assert_header_dest_equals(text, expected)))
-          .then(t.step_func_done(_ => resolve()))
-          .catch(t.unreached_func());
-      });
-
-      document.head.appendChild(e);
-    }, `<link rel='preload' as='${as}' href='https://${host}/...'>`);
-  }
-
-  let as_tests = [
-    [ "fetch", "empty" ],
-    [ "font", "font" ],
-    [ "image", "image" ],
-    [ "script", "script" ],
-    [ "style", "style" ],
-    [ "track", "track" ],
-  ];
-
-  as_tests.forEach(item => {
-    create_test("{{host}}:{{ports[https][0]}}", item[0], item[1]);
-    create_test("{{hosts[][www]}}:{{ports[https][0]}}", item[0], item[1]);
-    create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", item[0], item[1]);
-  });
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html
deleted file mode 100644
index ea13cc83bdfd..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/cross-site-redirect.tentative.https.sub.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body></body>
-<script>
-  let nonce = token();
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-cross-site-same-origin" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Cross-Site -> Same-Origin redirect");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-cross-site-same-site" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Cross-Site -> Same-Site redirect");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-cross-site-cross-site" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Cross-Site -> Cross-Site redirect");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html
deleted file mode 100644
index e74ce0c06d5b..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-cross-site.tentative.https.sub.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body></body>
-<script>
-  let nonce = token();
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-multiple-cross-site" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "https://{{host}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// same-origin
-      "https://{{hosts[alt][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// cross-site
-      "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;// same-origin
-
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Origin -> Cross-Site -> Same-Origin redirect");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html
deleted file mode 100644
index 78ee10dc736c..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/fetch/metadata/resources/redirectTestHelper.sub.js></script>
-<script src=/common/security-features/resources/common.sub.js></script>
-<script src=/common/utils.js></script>
-<style>
-  @font-face {
-    font-family: myDowngradeUpgradeFont;
-    src: url(https://{{host}}:{{ports[https][0]}}/fetch/api/resources/redirect.py?location=http%3A%2F%2F{{host}}%3A{{ports[http][0]}}%2Ffetch%2Fapi%2Fresources%2Fredirect.py%3Flocation%3Dhttps%253A%252F%252F{{host}}%253A{{ports[https][0]}}%252Ffetch%252Fmetadata%252Fresources%252Frecord-header.py%253Ffile%253Dfont-https-downgrade-upgrade{{$id:uuid()}});
-  }
-  #fontTest {
-    font-family: myDowngradeUpgradeFont;
-  }
-</style>
-<body>
-    <div id="fontTest">Downgraded then upgraded font</div>
-    <script>
-  let nonce = "{{$id}}";
-
-  // Validate various scenarios handle a request that redirects from https => http
-  // correctly and avoids disclosure of any Sec- headers.
-  RunCommonRedirectTests("Https downgrade-upgrade", MultipleRedirectTo, expected);
-
-  document.fonts.ready.then(function () {
-    promise_test(t => {
-      return new Promise((resolve, reject) => {
-        let key = "font-https-downgrade-upgrade{{$id}}";
-        return fetch_record_header_with_catch(key, "", assert_header_dest_equals, resolve, reject);
-      });
-    }, "Https downgrade-upgrade font => No headers");
-  });
-
-  promise_test(() => {
-    return requestViaImage(secureRedirectURL + encodeURIComponent(insecureRedirectURL + encodeURIComponent("https://{{host}}:{{ports[https][0]}}/common/security-features/subresource/image.py")))
-      .then(result => {
-         headers = result.headers;
-         got = {
-           "dest": headers["sec-fetch-dest"]
-         };
-         // Note that we're using `undefined` here, as opposed to "" elsewhere because of the way
-         // that `image.py` encodes data.
-         assert_header_dest_equals(got, undefined);
-      });
-  }, "Https downgrade-upgrade image => No headers");
-</script>
-<script src="https://{{host}}:{{ports[https][0]}}/fetch/api/resources/redirect.py?location=http%3A%2F%2F{{host}}%3A{{ports[http][0]}}%2Ffetch%2Fapi%2Fresources%2Fredirect.py%3Flocation%3Dhttps%253A%252F%252F{{host}}%253A{{ports[https][0]}}%252Ffetch%252Fmetadata%252Fresources%252Fecho-as-script.py"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-    assert_header_dest_equals(header, "");
-  }, "Https downgrade-upgrade script => No headers");
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html
deleted file mode 100644
index 90a476684398..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/multiple-redirect-same-site.tentative.https.sub.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body></body>
-<script>
-  let nonce = token();
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-multiple-same-site" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "https://{{host}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// same-origin
-      "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=" +// same-site
-      "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;// same-origin
-
-      e.onload = e => {
-        return fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        return fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Origin -> Same-Site -> Same-Origin redirect");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html
deleted file mode 100644
index a31efcbf26ac..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/redirect-http-upgrade.tentative.sub.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/fetch/metadata/resources/redirectTestHelper.sub.js></script>
-<script src=/common/security-features/resources/common.sub.js></script>
-<script src=/common/utils.js></script>
-<style>
-  @font-face {
-    font-family: myUpgradedFont;
-    src: url(http://{{host}}:{{ports[http][0]}}/fetch/api/resources/redirect.py?location=https%3A%2F%2F{{host}}%3A{{ports[https][0]}}%2Ffetch%2Fmetadata%2Fresources%2Frecord-header.py%3Ffile%3Dfont-https-upgrade{{$id:uuid()}});
-  }
-  #fontTest {
-    font-family: myUpgradedFont;
-  }
-</style>
-<body>
-    <div id="fontTest">Upgraded font</div>
-    <script>
-  let nonce = "{{$id}}";
-
-  // Validate various scenarios handle a request that redirects from http => https correctly and add the proper Sec- headers.
-  RunCommonRedirectTests("Http upgrade", upgradeRedirectTo, expected);
-
-  document.fonts.ready.then(function () {
-    promise_test(t => {
-      return new Promise((resolve, reject) => {
-        let key = "font-https-upgrade{{$id}}";
-        fetch_record_header_with_catch(key, "", assert_header_dest_equals, resolve, reject);
-      });
-    }, "Http upgrade font => No headers");
-  });
-
-  promise_test(() => {
-    return requestViaImage(insecureRedirectURL + encodeURIComponent("https://{{host}}:{{ports[https][0]}}/common/security-features/subresource/image.py"))
-      .then(result => {
-         headers = result.headers;
-         got = {
-           "dest": headers["sec-fetch-dest"]
-         };
-         // Note that we're using `undefined` here, as opposed to "" elsewhere because of the way
-         // that `image.py` encodes data.
-         assert_header_dest_equals(got, undefined);
-      });
-  }, "Http upgrade image => No headers");
-</script>
-
-<script src="http://{{host}}:{{ports[http][0]}}/fetch/api/resources/redirect.py?location=https%3A%2F%2F{{host}}%3A{{ports[https][0]}}%2Ffetch%2Fmetadata%2Fresources%2Fecho-as-script.py"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-    assert_header_dest_equals(header, "");
-  }, "Http upgrade script => No headers");
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html
deleted file mode 100644
index 425753cb5080..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/redirect-https-downgrade.tentative.sub.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/fetch/metadata/resources/redirectTestHelper.sub.js></script>
-<script src=/common/security-features/resources/common.sub.js></script>
-<script src=/common/utils.js></script>
-<style>
-  @font-face {
-    font-family: myDowngradedFont;
-    src: url(https://{{host}}:{{ports[https][0]}}/fetch/api/resources/redirect.py?location=http%3A%2F%2F{{host}}%3A{{ports[http][0]}}%2Ffetch%2Fmetadata%2Fresources%2Frecord-header.py%3Ffile%3Dfont-https-downgrade);
-  }
-  #fontTest {
-    font-family: myDowngradedFont;
-  }
-</style>
-<body>
-  <div id="fontTest">Downgraded font</div>
-  <script>
-  let nonce = token();
-
-  // Validate various scenarios handle a request that redirects from https => http correctly and avoids disclosure of any Sec- headers.
-  RunCommonRedirectTests("Https downgrade", downgradeRedirectTo, expected);
-
-  document.fonts.ready.then(function () {
-    promise_test(t => {
-      return new Promise((resolve, reject) => {
-        let key = "font-https-downgrade";
-        fetch_record_header_with_catch(key, "", assert_header_dest_equals, resolve, reject);
-      });
-    }, "Https downgrade font => No headers");
-  });
-
-  promise_test(() =>
-    return requestViaImage(secureRedirectURL + encodeURIComponent("http://{{host}}:{{ports[http][0]}}/common/security-features/subresource/image.py"))
-      .then(result => {
-         headers = result.headers;
-         got = {
-           "dest": headers["sec-fetch-dest"]
-         };
-         // Note that we're using `undefined` here, as opposed to "" elsewhere because of the way
-         // that `image.py` encodes data.
-         assert_header_dest_equals(got, undefined);
-  }), "Https downgrade image => No headers");
-</script>
-
-<script src="https://{{host}}:{{ports[https][0]}}/fetch/api/resources/redirect.py?location=http%3A%2F%2F{{host}}%3A{{ports[http][0]}}%2Ffetch%2Fmetadata%2Fresources%2Fecho-as-script.py"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-    assert_header_dest_equals(header, "");
-  }, "Https downgrade script => No headers");
-</script>
-</body>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html
deleted file mode 100644
index 9b8b44b0ef28..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/same-origin-redirect.tentative.https.sub.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body></body>
-<script>
-  let nonce = token();
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-same-origin-same-origin" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Origin -> Same-Origin redirect");
-
-promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-same-origin-same-site" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "/xhr/resources/redirect.py?location=https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Origin -> Same-Site redirect");
-
-promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-same-origin-cross-site" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "/xhr/resources/redirect.py?location=https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Origin -> Cross-Site redirect");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html
deleted file mode 100644
index 2f12fe03cab3..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/redirect/same-site-redirect.tentative.https.sub.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body></body>
-<script>
-  let nonce = token();
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-same-site-same-origin" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Site -> Same-Origin redirect");
-
-promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-same-site-same-site" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Site -> Same-Site redirect");
-
-promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "redirect-same-site-cross-site" + nonce;
-
-      let e = document.createElement('img');
-      e.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/xhr/resources/redirect.py?location=https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-      e.onerror = e => {
-        fetch_record_header_with_catch(key, "image", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Site -> Cross-Site redirect");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html
deleted file mode 100644
index d3cb7e101a56..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<link id="style" href="https://foo.bar" rel="stylesheet">
-<body></body>
-<script>
-  setup({ explicit_done: true });
-  function generate_test(expected, name) {
-    async_test(t => {
-      t.step_timeout(_ => {
-        return fetch_record_header("report-" + name, expected, assert_header_dest_equals)
-            .then(_ => t.done());
-      }, 1000);
-    }, name + " report");
-  }
-
-  let counter = 0;
-  document.addEventListener("securitypolicyviolation", (e) => {
-    counter++;
-    if (counter == 3) {
-      generate_test("report", "same-origin");
-      generate_test("report", "same-site");
-      generate_test("report", "cross-site");
-
-      done();
-    }
-  });
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.sub.headers
deleted file mode 100644
index 1ec5df78f301..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/report.tentative.https.sub.html.sub.headers
+++ /dev/null
@@ -1,3 +0,0 @@
-Content-Security-Policy: style-src 'self' 'unsafe-inline'; report-uri /fetch/metadata/resources/record-header.py?file=report-same-origin
-Content-Security-Policy: style-src 'self' 'unsafe-inline'; report-uri https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=report-same-site
-Content-Security-Policy: style-src 'self' 'unsafe-inline'; report-uri https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=report-cross-site
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html
deleted file mode 100644
index 18e8be78848f..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/script.tentative.https.sub.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-
-<!-- Same-origin script -->
-<script src="https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-script.py"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-
-    assert_header_dest_equals(header, "script");
-  }, "Same-origin script");
-</script>
-
-<!-- Same-site script -->
-<script src="https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-script.py"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-
-    assert_header_dest_equals(header, "script");
-  }, "Same-site script");
-</script>
-
-<!-- Cross-site script -->
-<script src="https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-script.py"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-
-    assert_header_dest_equals(header, "script");
-  }, "Cross-site script");
-</script>
-
-<!-- Same-origin script, CORS mode -->
-<script src="https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/echo-as-script.py" crossorigin="anonymous"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-
-    assert_header_dest_equals(header, "script");
-  }, "Same-origin CORS script");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/script.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/script.tentative.sub.html
deleted file mode 100644
index 0512dc676aae..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/script.tentative.sub.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-
-<!-- Same-origin script -->
-<script src="http://{{host}}:{{ports[http][0]}}/fetch/metadata/resources/echo-as-script.py"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-
-    assert_header_dest_equals(header, "");
-  }, "Non-secure same-origin script => No headers");
-</script>
-
-<!-- Same-site script -->
-<script src="http://{{hosts[][www]}}:{{ports[http][0]}}/fetch/metadata/resources/echo-as-script.py"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-
-    assert_header_dest_equals(header, "");
-  }, "Non-secure same-site script => No headers");
-</script>
-
-<!-- Cross-site script -->
-<script src="http://{{hosts[alt][www]}}:{{ports[http][0]}}/fetch/metadata/resources/echo-as-script.py"></script>
-<script>
-  test(t => {
-    t.add_cleanup(_ => { header = null; });
-
-    assert_header_dest_equals(header, "");
-  }, "Non-secure cross-site script => No headers");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html
deleted file mode 100644
index 1faee65bf076..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/serviceworker.tentative.https.sub.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<!--
-  This test verifies presence of Sec-Fetch-... request headers on a request
-  that fetches the service worker script itself (i.e. the script at the URL
-  passed as an argument to navigator.serviceWorker.register).
--->
-<meta charset="utf-8"/>
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body>
-  <script>
-    promise_test(async t => {
-      const nonce = token();
-      const key = "serviceworker-same-origin" + nonce;
-
-      // Register a service worker and check the request header.
-      const registration = await navigator.serviceWorker.register('https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=' + key);
-      t.add_cleanup(() => registration.unregister());
-      await retrieve_and_assert_headers(key, 'Register service worker');
-
-      // Trigger an update check and check the request header again.
-      await registration.update();
-      await retrieve_and_assert_headers(key, 'Update service worker');
-    }, 'metadata for service worker scripts');
-
-    async function retrieve_and_assert_headers(key, tag) {
-      const response = await fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-      const text = await response.text();
-      assert_header_dest_equals(text, "serviceworker", tag);
-    }
-  </script>
-</body>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html
deleted file mode 100644
index 882572c86fec..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/sharedworker.tentative.https.sub.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<script>
-  let nonce = token();
-  let key = "sharedworker-same-origin" + nonce;
-
-  // TESTS //
-  if (window.Worker) {
-
-      //  Same-Origin test
-      var sharedWorker = new SharedWorker('/fetch/metadata/resources/record-header.py?file=' + key);
-      sharedWorker.port.start();
-
-      sharedWorker.onerror = function(){
-        test_same_origin();
-      }
-      sharedWorker.port.onmessage = function(e) {
-        test_same_origin();
-      }
-      sharedWorker.port.postMessage("Ready");
-    }
-
-  function test_same_origin(){
-    promise_test(t => {
-      return new Promise((resolve, reject) => {
-        fetch_record_header_with_catch(key, "sharedworker", assert_header_dest_equals, resolve, reject);
-      })
-    }, "Same-Origin sharedworker")
-  }
-</script>
-<body></body>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html
deleted file mode 100644
index ed30c81c7dd2..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/style.tentative.https.sub.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE html>
-<html>
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body></body>
-<script>
-  let nonce = token();
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "style-same-origin" + nonce;
-
-      let e = document.createElement('link');
-      e.rel = "stylesheet";
-      e.href = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "style", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Origin style");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "style-same-site" + nonce;
-
-      let e = document.createElement('link');
-      e.rel = "stylesheet";
-      e.href = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "style", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Site style");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "style-cross-site" + nonce;
-
-      let e = document.createElement('link');
-      e.rel = "stylesheet";
-      e.href = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "style", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Cross-Site style");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "style-same-origin-cors" + nonce;
-
-      let e = document.createElement('link');
-      e.rel = "stylesheet";
-      e.href = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      e.crossOrigin = "anonymous";
-      e.onload = e => {
-        fetch_record_header_with_catch(key, "style", assert_header_dest_equals, resolve, reject);
-      };
-
-      document.body.appendChild(e);
-    })
-  }, "Same-Origin, cors style");
-</script>
-</html>
-
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html
deleted file mode 100644
index 09e927f1a7c1..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/track.tentative.https.sub.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE html>
-
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body>
-</body>
-<script>
-  let nonce = token();
-
-  function createVideoElement() {
-    let el = document.createElement('video');
-    el.src = "/media/movie_5.mp4";
-    el.setAttribute("controls", "");
-    el.setAttribute("crossorigin", "");
-    return el;
-  }
-
-  function createTrack() {
-    let el = document.createElement("track");
-    el.setAttribute("default", "");
-    el.setAttribute("kind", "captions");
-    el.setAttribute("srclang", "en");
-    return el;
-  }
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "track-same-origin" + nonce;
-      let video = createVideoElement();
-      let el = createTrack();
-      el.src = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      el.onload = t.step_func(_ => {
-        fetch_record_header_with_catch(key, "track", assert_header_dest_equals, resolve, reject);
-      });
-      video.appendChild(el);
-      document.body.appendChild(video);
-    });
-  }, "Same-Origin track");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "track-same-site" + nonce;
-      let video = createVideoElement();
-      let el = createTrack();
-      el.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      el.onload = t.step_func(_ => {
-        fetch_record_header_with_catch(key, "track", assert_header_dest_equals, resolve, reject);
-      });
-      video.appendChild(el);
-      document.body.appendChild(video);
-    });
-  }, "Same-Site track");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "track-cross-site" + nonce;
-      let video = createVideoElement();
-      let el = createTrack();
-      el.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      el.onload = t.step_func(_ => {
-        fetch_record_header_with_catch(key, "track", assert_header_dest_equals, resolve, reject);
-      });
-      video.appendChild(el);
-      document.body.appendChild(video);
-    });
-  }, "Cross-Site track");
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "track-same-origin-cors" + nonce;
-      let video = createVideoElement();
-
-      // Unset `crossorigin` to change the CORS mode:
-      video.crossOrigin = undefined;
-
-      let el = createTrack();
-      el.src = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
-      el.onload = t.step_func(_ => {
-        fetch_record_header_with_catch(key, "track", assert_header_dest_equals, resolve, reject);
-      });
-      video.appendChild(el);
-      document.body.appendChild(video);
-    });
-  }, "Same-Origin, CORS track");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html
deleted file mode 100644
index 283b928e9219..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/trailing-dot.tentative.https.sub.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script>
-  // Site
-  promise_test(t => {
-    return fetch("https://{{host}}.:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_dest_equals(j, "empty");
-        });
-  }, "Fetching a resource from the same origin, but spelled with a trailing dot.");
-
-  promise_test(t => {
-    return fetch("https://{{hosts[][www]}}.:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_dest_equals(j, "empty");
-        });
-  }, "Fetching a resource from the same site, but spelled with a trailing dot.");
-
-  promise_test(t => {
-    return fetch("https://{{hosts[alt][www]}}.:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_dest_equals(j, "empty");
-        });
-  }, "Fetching a resource from a cross-site host, spelled with a trailing dot.");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/unload.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/unload.tentative.https.sub.html
deleted file mode 100644
index a702fb83d597..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/unload.tentative.https.sub.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/testdriver.js></script>
-<script src=/resources/testdriver-vendor.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<body>
-<script>
-  // The test
-  // 1. Creates a same-origin iframe
-  // 2. Adds to the iframe an unload handler that will
-  //    trigger a request to <unload_request_url>/.../record-header.py...
-  // 3. Navigate the iframe to a cross-origin url (to data: url)
-  // 4. Waits until the request goes through
-  // 5. Verifies Sec-Fetch-Site request header of the request.
-  //
-  // This is a regression test for https://crbug.com/986577.
-  function create_test(unload_request_origin, expectation) {
-    async_test(t => {
-      // STEP 1: Create an iframe.
-      let nonce = token();
-      let key = "unload-test-" + nonce;
-      let url = unload_request_origin +
-          "/fetch/metadata/resources/record-header.py?file=" + key;
-      let i = document.createElement('iframe');
-      i.src = '/fetch/metadata/resources/unload-with-beacon.html';
-      i.onload = () => {
-          // STEP 2: Ask the iframe to add an unload handler.
-          i.contentWindow.postMessage(url, '*');
-      };
-      window.addEventListener('message', e => {
-          // STEP 3: Navigate the iframe away
-          i.contentWindow.location = 'data:text/html,DONE';
-      });
-      document.body.appendChild(i);
-
-      // STEPS 4 and 5: Wait for the beacon to go through and verify
-      // the request headers.
-      function wait_and_verify() {
-          t.step_timeout(() => {
-              let callback_method = text => t.step(() => {
-                if (text == "No header has been recorded") {
-                  wait_and_verify();
-                  return;
-                }
-                assert_header_dest_equals(text, expectation);
-                t.done();
-              });
-              fetch_record_header(key, expectation, callback_method);
-          }, 200);
-      }
-      wait_and_verify();
-    }, "Fetch from an unload handler");
-  }
-
-  create_test("https://{{host}}:{{ports[https][0]}}", "empty");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/window-open.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/window-open.tentative.https.sub.html
deleted file mode 100644
index 650ba6afa16c..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/window-open.tentative.https.sub.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/testdriver.js></script>
-<script src=/resources/testdriver-vendor.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<body>
-<script>
-  // Forced navigations:
-  async_test(t => {
-    let w = window.open("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py");
-    t.add_cleanup(_ => w.close());
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != w)
-        return;
-
-      assert_header_dest_equals(e.data, "document");
-      t.done();
-    }));
-  }, "Same-origin window, forced");
-
-  async_test(t => {
-    let w = window.open("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py");
-    t.add_cleanup(_ => w.close());
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != w)
-        return;
-
-      assert_header_dest_equals(e.data, "document");
-      t.done();
-    }));
-  }, "Same-site window, forced");
-
-  async_test(t => {
-    let w = window.open("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py");
-    t.add_cleanup(_ => w.close());
-    window.addEventListener('message', t.step_func(e => {
-      if (e.source != w)
-        return;
-
-      assert_header_dest_equals(e.data, "document");
-      t.done();
-    }));
-  }, "Cross-site window, forced");
-
-  async_test(t => {
-    let w = window.open("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py");
-    t.add_cleanup(_ => w.close());
-    let messages = 0;
-    window.addEventListener('message', t.step_func(e => {
-      messages++;
-      if (e.source != w)
-        return;
-
-      assert_header_dest_equals(e.data, "document");
-
-      if (messages == 1) {
-        w.location.reload();
-      } else {
-        t.done();
-      }
-    }));
-  }, "Same-origin window, forced, reloaded");
-
-  async_test(t => {
-    let w = window.open("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py");
-    t.add_cleanup(_ => w.close());
-    let messages = 0;
-    window.addEventListener('message', t.step_func(e => {
-      messages++;
-      if (e.source != w)
-        return;
-
-      assert_header_dest_equals(e.data, "document");
-
-      if (messages == 1) {
-        w.location.reload();
-      } else {
-        t.done();
-      }
-    }));
-  }, "Same-site window, forced, reloaded");
-
-  async_test(t => {
-    let w = window.open("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py");
-    t.add_cleanup(_ => w.close());
-    let messages = 0;
-    window.addEventListener('message', t.step_func(e => {
-      messages++;
-      if (e.source != w)
-        return;
-
-      assert_header_dest_equals(e.data, "document");
-
-      if (messages == 1) {
-        w.location.reload();
-      } else {
-        t.done();
-      }
-    }));
-  }, "Cross-site window, forced, reloaded");
-
-  // User-activated navigations:
-  async_test(t => {
-    let b = document.createElement('button');
-    b.onclick = t.step_func(_ => {
-      let w = window.open("https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py");
-      t.add_cleanup(_ => w.close());
-      window.addEventListener('message', t.step_func(e => {
-        if (e.source != w)
-          return;
-
-        assert_header_dest_equals(e.data, "document");
-        t.done();
-      }));
-    });
-    document.body.appendChild(b);
-    test_driver.click(b);
-  }, "Same-origin window, user-activated");
-
-  async_test(t => {
-    let b = document.createElement('button');
-    b.onclick = t.step_func(_ => {
-      let w = window.open("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py");
-      t.add_cleanup(_ => w.close());
-      window.addEventListener('message', t.step_func(e => {
-        if (e.source != w)
-          return;
-
-        assert_header_dest_equals(e.data, "document");
-        t.done();
-      }));
-    });
-    document.body.appendChild(b);
-    test_driver.click(b);
-  }, "Same-site window, user-activated");
-
-  async_test(t => {
-    let b = document.createElement('button');
-    b.onclick = t.step_func(_ => {
-      let w = window.open("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/post-to-owner.py");
-      t.add_cleanup(_ => w.close());
-      window.addEventListener('message', t.step_func(e => {
-        if (e.source != w)
-          return;
-
-        assert_header_dest_equals(e.data, "document");
-        t.done();
-      }));
-    });
-    document.body.appendChild(b);
-    test_driver.click(b);
-  }, "Cross-site window, user-activated");
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html
deleted file mode 100644
index 8e40fb621e24..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/worker.tentative.https.sub.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<script>
-  let nonce = token();
-
-  promise_test(t => {
-    return new Promise((resolve, reject) => {
-      let key = "worker-same-origin" + nonce;
-      let w = new Worker("/fetch/metadata/resources/record-header.py?file=" + key);
-      w.onmessage = e => {
-        fetch_record_header_with_catch(key, "worker", assert_header_dest_equals, resolve, reject);
-      };
-    });
-  }, "Same-Origin worker");
-</script>
-<body></body>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html
deleted file mode 100644
index df44514fa1f3..000000000000
--- a/tests/wpt/web-platform-tests/fetch/metadata/sec-fetch-dest/xslt.tentative.https.sub.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-
-<link rel="author" href="mtrzos@google.com" title="Maciek Trzos">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/fetch/metadata/resources/helper.js></script>
-<script src=/common/utils.js></script>
-<script>
-  // Open a window with XML document which loads resources via <?xml-stylesheet/> tag
-  let nonce = token();
-  let w = window.open("/fetch/metadata/resources/xslt-test.sub.xml?token=" + nonce);
-  window.addEventListener('message', function(e) {
-    if (e.source != w)
-      return;
-
-    promise_test(t => {
-      return fetch_record_header("xslt-same-origin" + nonce, "xslt", assert_header_dest_equals);
-    }, "Same-Origin xslt");
-
-    promise_test(t => {
-      return fetch_record_header("xslt-same-site" + nonce, "xslt", assert_header_dest_equals);
-    }, "Same-site xslt");
-
-    promise_test(t => {
-      return fetch_record_header("xslt-cross-site" + nonce, "xslt", assert_header_dest_equals);
-    }, "Cross-site xslt");
-
-    w.close();
-  });
-
-</script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/serviceworker.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/serviceworker.tentative.https.sub.html
index 1fbdee4f091b..51bc7f29e593 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/serviceworker.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/serviceworker.tentative.https.sub.html
@@ -27,7 +27,7 @@
     }, 'metadata for service worker scripts');
 
     async function retrieve_and_assert_headers(key, tag) {
-      let expected = { "site": "same-origin", "user": "", "mode": "same-origin" };
+      let expected = { "site": "same-origin", "user": "", "mode": "same-origin", "dest": "serviceworker" };
       const response = await fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key);
       const text = await response.text();
       assert_header_equals(text, expected, tag);
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/sharedworker.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/sharedworker.tentative.https.sub.html
index 0408c44201fa..4df858208a74 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/sharedworker.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/sharedworker.tentative.https.sub.html
@@ -28,11 +28,9 @@
   function test_same_origin(){
     promise_test(t => {
       return new Promise((resolve, reject) => {
-        let expected = {"site":"same-origin", "user":"", "mode": "same-origin"};
+        let expected = {"site":"same-origin", "user":"", "mode": "same-origin", "dest": "sharedworker"};
 
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected)
           .then(_ => resolve())
           .catch(e => reject(e));
       })
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/style.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/style.tentative.https.sub.html
index 08ac184b4210..a30d81d70ddb 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/style.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/style.tentative.https.sub.html
@@ -17,10 +17,8 @@
       e.rel = "stylesheet";
       e.href = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"site":"same-origin", "user":"", "mode": "no-cors"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"same-origin", "user":"", "mode": "no-cors", "dest": "style"};
+        validate_expectations(key, expected, "Same-Origin style")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -37,10 +35,8 @@
       e.rel = "stylesheet";
       e.href = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"site":"same-site", "user":"", "mode": "no-cors"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"same-site", "user":"", "mode": "no-cors", "dest": "style"};
+        validate_expectations(key, expected, "Same-Site style")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -57,10 +53,8 @@
       e.rel = "stylesheet";
       e.href = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
       e.onload = e => {
-        let expected = {"site":"cross-site", "user":"", "mode": "no-cors"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"cross-site", "user":"", "mode": "no-cors", "dest": "style"};
+        validate_expectations(key, expected, "Cross-Site style")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
@@ -78,10 +72,8 @@
       e.href = "https://{{host}}:{{ports[https][0]}}/fetch/metadata/resources/record-header.py?file=" + key;
       e.crossOrigin = "anonymous";
       e.onload = e => {
-        let expected = {"site":"same-origin", "user":"", "mode": "cors"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"same-origin", "user":"", "mode": "cors", "dest": "style"};
+        validate_expectations(key, expected, "Same-Origin, cors style")
           .then(_ => resolve())
           .catch(e => reject(e));
       };
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/track.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/track.tentative.https.sub.html
index 11e45e23efd0..346798fdc0e5 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/track.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/track.tentative.https.sub.html
@@ -36,11 +36,10 @@
         expected = {
           "site": "same-origin",
           "user": "",
-          "mode": "cors" // Because the `video` element has `crossorigin`
+          "mode": "cors", // Because the `video` element has `crossorigin`
+          "dest": "track"
         };
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-            .then(response => response.text())
-            .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Origin track")
             .then(_ => resolve());
       });
       video.appendChild(el);
@@ -58,11 +57,10 @@
         expected = {
           "site": "same-site",
           "user": "",
-          "mode": "cors" // Because the `video` element has `crossorigin`
+          "mode": "cors", // Because the `video` element has `crossorigin`
+          "dest": "track"
         };
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-            .then(response => response.text())
-            .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Site track")
             .then(resolve)
             .catch(reject);
 
@@ -82,11 +80,10 @@
         expected = {
           "site": "cross-site",
           "user": "",
-          "mode": "cors" // Because the `video` element has `crossorigin`
+          "mode": "cors", // Because the `video` element has `crossorigin`
+          "dest": "track"
         };
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-            .then(response => response.text())
-            .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected,"Cross-Site track")
             .then(resolve)
             .catch(reject);
       });
@@ -109,11 +106,10 @@
         expected = {
           "site":"same-origin",
           "user":"",
-          "mode": "same-origin"
+          "mode": "same-origin",
+          "dest": "track"
         };
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-            .then(response => response.text())
-            .then(text => assert_header_equals(text, expected))
+        validate_expectations(key, expected, "Same-Origin, CORS track")
             .then(_ => resolve());
       });
       video.appendChild(el);
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/trailing-dot.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/trailing-dot.tentative.https.sub.html
index f7069e722558..afd876f0524d 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/trailing-dot.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/trailing-dot.tentative.https.sub.html
@@ -5,38 +5,29 @@
 <script>
   // Site
   promise_test(t => {
-    return fetch("https://{{host}}.:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("https://{{host}}.:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {}, {
             "site": "cross-site",
             "user": "",
             "mode": "cors",
-          });
-        });
+            "dest": "empty"
+          }, "Fetching a resource from the same origin, but spelled with a trailing dot.");
   }, "Fetching a resource from the same origin, but spelled with a trailing dot.");
 
   promise_test(t => {
-    return fetch("https://{{hosts[][www]}}.:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("https://{{hosts[][www]}}.:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {}, {
             "site": "cross-site",
             "user": "",
             "mode": "cors",
-          });
-        });
+            "dest": "empty"
+          }, "Fetching a resource from the same site, but spelled with a trailing dot.");
   }, "Fetching a resource from the same site, but spelled with a trailing dot.");
 
   promise_test(t => {
-    return fetch("https://{{hosts[alt][www]}}.:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py")
-        .then(r => r.json())
-        .then(j => {
-          assert_header_equals(j, {
+    return validate_expectations_custom_url("https://{{hosts[alt][www]}}.:{{ports[https][0]}}/fetch/metadata/resources/echo-as-json.py", {}, {
             "site": "cross-site",
             "user": "",
             "mode": "cors",
-          });
-        });
+            "dest": "empty"
+          }, "Fetching a resource from a cross-site host, spelled with a trailing dot.");
   }, "Fetching a resource from a cross-site host, spelled with a trailing dot.");
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/unload.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/unload.tentative.https.sub.html
index 8917c53a3b38..bc26048c8107 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/unload.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/unload.tentative.https.sub.html
@@ -58,6 +58,7 @@
   create_test("https://{{host}}:{{ports[https][0]}}", {
     "site": "same-origin",
     "user": "",
-    "mode": "no-cors"
+    "mode": "no-cors",
+    "dest": "empty"
   });
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/window-open.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/window-open.tentative.https.sub.html
index 29c325f1213e..94ba76a19ff2 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/window-open.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/window-open.tentative.https.sub.html
@@ -18,7 +18,8 @@
         "site": "same-origin",
         "user": "",
         "mode": "navigate",
-      });
+        "dest": "document"
+      }, "Same-origin window, forced");
       t.done();
     }));
   }, "Same-origin window, forced");
@@ -34,7 +35,8 @@
         "site": "same-site",
         "user": "",
         "mode": "navigate",
-      });
+        "dest": "document"
+      }, "Same-site window, forced");
       t.done();
     }));
   }, "Same-site window, forced");
@@ -50,7 +52,8 @@
         "site": "cross-site",
         "user": "",
         "mode": "navigate",
-      });
+        "dest": "document"
+      }, "Cross-site window, forced");
       t.done();
     }));
   }, "Cross-site window, forced");
@@ -68,7 +71,8 @@
         "site": "same-origin",
         "user": "",
         "mode": "navigate",
-      });
+        "dest": "document"
+      }, "Same-origin window, forced, reloaded");
 
       if (messages == 1) {
         w.location.reload();
@@ -91,7 +95,8 @@
         "site": "same-site",
         "user": "",
         "mode": "navigate",
-      });
+        "dest": "document"
+      }, "Same-site window, forced, reloaded");
 
       if (messages == 1) {
         w.location.reload();
@@ -114,7 +119,8 @@
         "site": "cross-site",
         "user": "",
         "mode": "navigate",
-      });
+        "dest": "document"
+      }, "Cross-site window, forced, reloaded");
 
       if (messages == 1) {
         w.location.reload();
@@ -138,7 +144,8 @@
           "site": "same-origin",
           "user": "?1",
           "mode": "navigate",
-        });
+          "dest": "document"
+        }, "Same-origin window, user-activated");
         t.done();
       }));
     });
@@ -159,7 +166,8 @@
           "site": "same-site",
           "user": "?1",
           "mode": "navigate",
-        });
+          "dest": "document"
+        }, "Same-site window, user-activated");
         t.done();
       }));
     });
@@ -180,7 +188,8 @@
           "site": "cross-site",
           "user": "?1",
           "mode": "navigate",
-        });
+          "dest": "document"
+        }, "Cross-site window, user-activated");
         t.done();
       }));
     });
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/worker.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/worker.tentative.https.sub.html
index d2162d5bc7ab..20a4fe541660 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/worker.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/worker.tentative.https.sub.html
@@ -13,10 +13,8 @@
       let key = "worker-same-origin" + nonce;
       let w = new Worker("/fetch/metadata/resources/record-header.py?file=" + key);
       w.onmessage = e => {
-        let expected = {"site":"same-origin", "user":"", "mode": "same-origin"};
-        fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=" + key)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected))
+        let expected = {"site":"same-origin", "user":"", "mode": "same-origin", "dest": "worker"};
+        validate_expectations(key, expected)
           .then(_ => resolve())
           .catch(e => reject(e));
       };
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/xslt.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/xslt.tentative.https.sub.html
index 5fc647b3ae7d..dc72d7b8a678 100644
--- a/tests/wpt/web-platform-tests/fetch/metadata/xslt.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/metadata/xslt.tentative.https.sub.html
@@ -13,27 +13,12 @@
     if (e.source != w)
       return;
 
+    // Only testing same-origin XSLT because same-site and cross-site XSLT is blocked.
     promise_test(t => {
-      let expected = {"site":"same-origin", "user":"", "mode": "same-origin"};
-      return fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=xslt-same-origin" + nonce)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected));
+      let expected = {"site":"same-origin", "user":"", "mode": "same-origin", "dest": "xslt"};
+      return validate_expectations("xslt-same-origin" + nonce, expected);
     }, "Same-Origin xslt");
 
-    promise_test(t => {
-      let expected = {"site":"same-site", "user":"", "mode": "no-cors"};
-      return fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=xslt-same-site" + nonce)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected));
-    }, "Same-site xslt");
-
-    promise_test(t => {
-      let expected = {"site":"cross-site", "user":"", "mode": "no-cors"};
-      return fetch("/fetch/metadata/resources/record-header.py?retrieve=true&file=xslt-cross-site" + nonce)
-          .then(response => response.text())
-          .then(text => assert_header_equals(text, expected));
-    }, "Cross-site xslt");
-
     w.close();
   });
 
diff --git a/tests/wpt/web-platform-tests/html/dom/usvstring-reflection.https.html b/tests/wpt/web-platform-tests/html/dom/usvstring-reflection.https.html
index b9cafd1fb352..162d58c50c44 100644
--- a/tests/wpt/web-platform-tests/html/dom/usvstring-reflection.https.html
+++ b/tests/wpt/web-platform-tests/html/dom/usvstring-reflection.https.html
@@ -107,12 +107,12 @@
 test(() => {
   // This shouldn't throw an exception.
   window.navigator.registerProtocolHandler('web+myprotocol', "custom-scheme\uD800/url=%s", "title");
-}, "RegisterPtotocolHandler URL: unpaired surrogate codepoint should not make any exceptions.")
+}, "RegisterProtocolHandler URL: unpaired surrogate codepoint should not make any exceptions.")
 
 test(() => {
   // This shouldn't throw an exception.
   window.navigator.unregisterProtocolHandler('web+myprotocol', "custom-scheme\uD800/url=%s");
-}, "UnregisterPtotocolHandler URL: unpaired surrogate codepoint should not make any exceptions.")
+}, "UnregisterProtocolHandler URL: unpaired surrogate codepoint should not make any exceptions.")
 
 test(() => {
   var w = window.open("about:blank#\uD800");
diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events.html b/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events.html
new file mode 100644
index 000000000000..9d112e88d135
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-error-events.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<link rel="author" title="Dom Farolino" href="mailto:dom@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-link-element">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link id=style_link rel=stylesheet>
+<script>
+  async_test(t => {
+    const link = document.querySelector('#style_link');
+    link.onload = t.unreached_func('Sheet should fail to load');
+    link.onerror = t.step_func(() => {
+      link.onerror = t.step_func_done(() => {});
+      link.href = 'nonexistent.css?second';
+    });
+
+    link.href = 'nonexistent.css?first';
+  }, "Check if the <link>'s error event fires for each stylesheet it fails to load");
+
+  </script>
+</head>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events.html b/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events.html
new file mode 100644
index 000000000000..b5550bb382c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-multiple-load-events.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<link rel="author" title="Dom Farolino" href="mailto:dom@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#the-link-element">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link id=style_link rel=stylesheet>
+<script>
+  async_test(t => {
+    const link = document.querySelector('#style_link');
+    link.onerror = t.unreached_func('Sheet should load successfully');
+    link.onload = t.step_func(() => {
+      link.onload = t.step_func_done(() => {});
+      link.href = 'style.css?second';
+    });
+
+    link.href = 'style.css?first';
+
+  }, "Check if the <link>'s load event fires for each stylesheet it loads");
+  </script>
+</head>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html
index 006827f186eb..dcf10077331e 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html
@@ -21,7 +21,7 @@
 }, 'the unregisterProtocolHandler method should exist on the navigator object');
 
 /* URL argument */
-const vaild_urls = [
+const valid_urls = [
   '%s',
   location.href + '/%s',
   location.href + '#%s',
@@ -31,7 +31,7 @@
   location.href + '/%s/bar/baz/?foo=1337&bar#baz',
   location.href + '/%s/foo/%s/',
 ];
-for (const url of vaild_urls) {
+for (const url of valid_urls) {
   test(() => {
     navigator.registerProtocolHandler('tel', url, 'foo');
   }, 'registerProtocolHandler: Valid URL "' + url + '" should work.');
@@ -61,7 +61,7 @@
   }, 'unregisterProtocolHandler: Invalid URL "' + url + '" should throw SYNTAX_ERR.');
 }
 
-const invaild_urls2 = [
+const invalid_urls2 = [
   'http://%s.com',
   'http://%s.example.com',
   'http://example.com/%s',
@@ -70,7 +70,7 @@
   'mailto:%s@example.com',
   'mailto:%s',
 ];
-for (const url of invaild_urls2) {
+for (const url of invalid_urls2) {
   test(() => {
     assert_throws('SECURITY_ERR', () => { navigator.registerProtocolHandler('mailto', url, 'foo'); });
   }, 'registerProtocolHandler: Invalid URL "' + url + '" should throw SECURITY_ERR.');
@@ -84,7 +84,7 @@
 
 /* Overriding any of the following protocols must never be allowed. That would
  * break the browser. */
-const blacklist = [
+const denylist = [
   'about',
   'attachment',
   'blob',
@@ -124,13 +124,13 @@
   'tel:sip',
   'web+',
 ];
-for (const scheme of blacklist) {
+for (const scheme of denylist) {
   test(() => {
     assert_throws('SECURITY_ERR', () => { navigator.registerProtocolHandler(scheme, location.href + '/%s', 'foo'); });
   }, 'registerProtocolHandler: Attempting to override the "' + scheme + '" protocol should throw SECURITY_ERR.');
 
   test(() => {
-    assert_throws('SECURITY_ERR', () => { navigator.unregisterProtocolHandler(scheme, location.href + '/%s', 'foo'); });
+    assert_throws('SECURITY_ERR', () => { navigator.unregisterProtocolHandler(scheme, location.href + '/%s'); });
   }, 'unregisterProtocolHandler: Attempting to override the "' + scheme + '" protocol should throw SECURITY_ERR.');
 }
 
@@ -161,7 +161,7 @@
   'webcal',
   'wtai',
   'xmpp',
-  /*other vaild schemes*/
+  /*other valid schemes*/
   'BitcoIn',
   'Irc',
   'MagneT',
diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html
new file mode 100644
index 000000000000..685f5d19d7ca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script>
+    test(t => {
+      assert_false('registerProtocolHandler' in navigator);
+      assert_equals(navigator.registerProtocolHandler, undefined);
+    }, "navigator.registerProtocolHandler does not exist in non-secure contexts.");
+
+    test(t => {
+      assert_false('unregisterProtocolHandler' in navigator);
+      assert_equals(navigator.unregisterProtocolHandler, undefined);
+    }, "navigator.unregisterProtocolHandler does not exist in non-secure contexts.");
+  </script>
+</head>
+</html>
diff --git a/tests/wpt/web-platform-tests/import-maps/core/not-as-classic-script.html b/tests/wpt/web-platform-tests/import-maps/core/not-as-classic-script.html
new file mode 100644
index 000000000000..5f97394e4408
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/core/not-as-classic-script.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script>
+setup({allow_uncaught_exception : true});
+
+const t_parse = async_test("Import maps shouldn't be parsed as scripts");
+const t_evaluate = async_test("Import maps shouldn't be executed as scripts");
+const t_external = async_test(
+   "External import maps shouldn't be executed as scripts");
+
+const errorHandler = event => {
+  event.preventDefault();
+  t_parse.unreached_func("An import map is parsed as a classic script")();
+};
+
+window.addEventListener("error", errorHandler, {once: true});
+</script>
+
+<!-- This import map causes a parse error when parsed as a classic script. -->
+<script type="importmap">
+{
+  "imports": {
+  }
+}
+</script>
+
+<script>
+// Remove error handler, because the following import map can causes parse
+// error.
+window.removeEventListener("error", errorHandler);
+</script>
+
+<script type="importmap">
+t_evaluate.unreached_func("An import map is evaluated")();
+</script>
+
+<script type="importmap" src="data:text/javascript,t_external.unreached_func('An external import map is evaluated')();"></script>
+
+<script>
+t_parse.done();
+t_evaluate.done();
+t_external.done();
+</script>
diff --git a/tests/wpt/web-platform-tests/inert/inert-in-shadow-dom.tentative.html b/tests/wpt/web-platform-tests/inert/inert-in-shadow-dom.tentative.html
index 36c962b1fc7d..ec825dbfdc98 100644
--- a/tests/wpt/web-platform-tests/inert/inert-in-shadow-dom.tentative.html
+++ b/tests/wpt/web-platform-tests/inert/inert-in-shadow-dom.tentative.html
@@ -2,32 +2,44 @@
 <html>
 <head>
     <meta charset="utf-8" />
-    <title>inert inside ShadowRoot affects slotted content</title>
+    <title>inert on Shadow host affects content in shadow</title>
     <link rel="author" title="Alice Boxhall" href="aboxhall@chromium.org">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 </head>
 <body>
-  <div>Button 1 should be inert, and Button 2 should not be inert.</div>
-  <div id="shadow-host">
-    <button slot="slot-1" id="button-1">Button 1 (inert)</button>
-    <button slot="slot-2" id="button-2">Button 2 (not inert)</button>
+  <div>Buttons 1 and 2 should be inert.</div>
+  <div id="shadow-host" inert>
+    <button id="button-1">Button 1 (inert)</button>
   </div>
   <script>
+    /*
+    Eventual flattened tree structure:
+
+    <div id="shadow-host" inert>
+      #shadow-root (open)
+      | <slot>
+      :   <button id="button-1">Button 1 (inert)</button> <!-- slotted -->
+      | </slot>
+      | <button id="button-2">Button 2 (inert)</button>   <!-- in shadow -->
+    </div>
+    */
+
     const shadowHost = document.getElementById("shadow-host");
     const shadowRoot = shadowHost.attachShadow({ mode: "open" });
-    const inertDiv = document.createElement("div");
-    inertDiv.inert = true;
-    shadowRoot.appendChild(inertDiv);
-    const slot1 = document.createElement("slot");
-    slot1.name = "slot-1";
-    inertDiv.appendChild(slot1);
-    const slot2 = document.createElement("slot");
-    slot2.name = "slot-2";
-    shadowRoot.appendChild(slot2);
 
-    function testCanFocus(selector, canFocus) {
-      const element = document.querySelector(selector);
+    // Button 1 will be slotted
+    const slot = document.createElement("slot");
+    shadowRoot.appendChild(slot);
+
+    const button2 = document.createElement("button");
+    button2.id = "button-2";
+    button2.textContent = "Button 2 (inert)";
+    shadowRoot.appendChild(button2);
+
+    function testCanFocus(selector, canFocus, opt_context) {
+      let context = opt_context || document;
+      const element = context.querySelector(selector);
       let focusedElement = null;
       element.addEventListener("focus", function() { focusedElement = element; }, false);
       element.focus();
@@ -36,8 +48,8 @@
 
     test(() => {
       testCanFocus("#button-1", false);
-      testCanFocus("#button-2", true);
-    }, "inert inside ShadowRoot affects slotted content");
+      testCanFocus("#button-2", false, shadowRoot);
+    }, "inert on Shadow host affects content in shadow");
   </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/inert/inert-on-slots.tentative.html b/tests/wpt/web-platform-tests/inert/inert-on-slots.tentative.html
new file mode 100644
index 000000000000..dd0d7ec6d46d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/inert/inert-on-slots.tentative.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title>inert inside ShadowRoot affects slotted content</title>
+    <link rel="author" title="Alice Boxhall" href="aboxhall@chromium.org">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+  <div>Button 1 should be inert, and Button 2 should not be inert.</div>
+  <div id="shadow-host">
+    <button slot="slot-1" id="button-1">Button 1 (inert)</button>
+    <button slot="slot-2" id="button-2">Button 2 (not inert)</button>
+  </div>
+  <script>
+    /*
+    Eventual flattened tree structure:
+
+    <div id="shadow-host">
+      #shadow-root (open)
+      | <slot id="slot-1" inert>
+      :   <button id="button-1">Button 1</button> <!-- slotted -->
+      | </slot>
+      | <slot id="slot-2">
+      :   <button id="button-2">Button 2</button> <!-- slotted -->
+      | </slot>
+    </div>
+    */
+
+    const shadowHost = document.getElementById("shadow-host");
+    const shadowRoot = shadowHost.attachShadow({ mode: "open" });
+
+    const slot1 = document.createElement("slot");
+    slot1.name = "slot-1";
+    slot1.inert = true;
+    shadowRoot.appendChild(slot1);
+
+    const slot2 = document.createElement("slot");
+    slot2.name = "slot-2";
+    shadowRoot.appendChild(slot2);
+
+    function testCanFocus(selector, canFocus) {
+      const element = document.querySelector(selector);
+      let focusedElement = null;
+      element.addEventListener("focus", function() { focusedElement = element; }, false);
+      element.focus();
+      assert_equals((focusedElement === element), canFocus);
+    }
+
+    test(() => {
+      testCanFocus("#button-1", false);
+      testCanFocus("#button-2", true);
+    }, "inert inside ShadowRoot affects slotted content");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini
index c7b3482c786f..4a4f5946fad7 100644
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPoints.html.ini
@@ -1,3 +1,6 @@
 [multiTouchPoints.html]
   expected:
     if product == "firefox" or product == "safari" or product == "epiphany" or product == "webkit": ERROR
+  [TestDriver actions: two touch points with one moving one pause]
+     expected:
+       if product == "chrome": FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini
new file mode 100644
index 000000000000..4f1939a431ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/multiTouchPointsWithPause.html.ini
@@ -0,0 +1,3 @@
+[multiTouchPointsWithPause.html]
+  expected:
+    if product == "firefox" or product == "safari": ERROR
diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsWithPause.html b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsWithPause.html
new file mode 100644
index 000000000000..645caf2c720e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/multiTouchPointsWithPause.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver actions: two touch points with one moving one pause</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+div#test1{
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100px;
+  height: 100px;
+  background-color: blue;
+}
+
+</style>
+
+<div id="test1">
+</div>
+
+<script>
+let event_type = [];
+let event_id = [];
+
+async_test(t => {
+  let test1 = document.getElementById("test1");
+  document.getElementById("test1").addEventListener("pointerdown",
+    e => {event_type.push(e.type); event_id.push(e.pointerId);});
+  document.getElementById("test1").addEventListener("pointerup",
+    e => {event_type.push(e.type); event_id.push(e.pointerId);});
+  document.getElementById("test1").addEventListener("pointermove",
+    e => {event_type.push(e.type); event_id.push(e.pointerId);});
+
+  let actions = new test_driver.Actions()
+      .addPointer("touchPointer1", "touch")
+      .addPointer("touchPointer2", "touch")
+      .pointerMove(0, 0, {origin: test1, sourceName: "touchPointer1"})
+      .pointerMove(10, 0, {origin: test1, sourceName: "touchPointer2"})
+      .pointerDown({sourceName: "touchPointer1"})
+      .pointerDown({sourceName: "touchPointer2"})
+      .pause(0, "pointer", {sourceName: "touchPointer1"})
+      .pointerMove(0, 10, {origin: test1, sourceName: "touchPointer2"})
+      .pointerUp({sourceName: "touchPointer1"})
+      .pointerUp({sourceName: "touchPointer2"});
+
+  actions.send()
+    .then(t.step_func_done(() => {assert_array_equals(event_type, ["pointerdown", "pointerdown", "pointermove", "pointerup", "pointerup"]);
+      assert_array_equals(event_id, [2, 3, 3, 2, 3]);}))
+    .catch(e => t.step_func(() => assert_unreached("Actions sequence failed " + e)));
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl b/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl
index 7c93a52d2a7a..bcdbaa64623b 100644
--- a/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/DOM-Parsing.idl
@@ -3,8 +3,9 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: DOM Parsing and Serialization (https://w3c.github.io/DOM-Parsing/)
 
-[Constructor, Exposed=Window]
+[Exposed=Window]
 interface DOMParser {
+  constructor();
   [NewObject] Document parseFromString(DOMString str, SupportedType type);
 };
 
@@ -16,20 +17,21 @@ enum SupportedType {
   "image/svg+xml"
 };
 
-[Constructor, Exposed=Window]
+[Exposed=Window]
 interface XMLSerializer {
+  constructor();
   DOMString serializeToString(Node root);
 };
 
 interface mixin InnerHTML {
-  [CEReactions, TreatNullAs=EmptyString] attribute DOMString innerHTML;
+  [CEReactions] attribute [TreatNullAs=EmptyString] DOMString innerHTML;
 };
 
 Element includes InnerHTML;
 ShadowRoot includes InnerHTML;
 
 partial interface Element {
-  [CEReactions, TreatNullAs=EmptyString] attribute DOMString outerHTML;
+  [CEReactions] attribute [TreatNullAs=EmptyString] DOMString outerHTML;
   [CEReactions] void insertAdjacentHTML(DOMString position, DOMString text);
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/audio-output.idl b/tests/wpt/web-platform-tests/interfaces/audio-output.idl
index 2a86188565fd..cf0f46d08bc3 100644
--- a/tests/wpt/web-platform-tests/interfaces/audio-output.idl
+++ b/tests/wpt/web-platform-tests/interfaces/audio-output.idl
@@ -5,5 +5,5 @@
 
 partial interface HTMLMediaElement {
   [SecureContext] readonly attribute DOMString sinkId;
-  [SecureContext] Promise<void> setSinkId(DOMString sinkId);
+  [SecureContext] Promise<void> setSinkId (DOMString sinkId);
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/battery-status.idl b/tests/wpt/web-platform-tests/interfaces/battery-status.idl
index 1dcaabb0bad2..3f7a58b38be5 100644
--- a/tests/wpt/web-platform-tests/interfaces/battery-status.idl
+++ b/tests/wpt/web-platform-tests/interfaces/battery-status.idl
@@ -9,12 +9,12 @@ partial interface Navigator {
 
 [Exposed=Window]
 interface BatteryManager : EventTarget {
-    readonly        attribute boolean charging;
+    readonly        attribute boolean             charging;
     readonly        attribute unrestricted double chargingTime;
     readonly        attribute unrestricted double dischargingTime;
-    readonly        attribute double level;
-                    attribute EventHandler onchargingchange;
-                    attribute EventHandler onchargingtimechange;
-                    attribute EventHandler ondischargingtimechange;
-                    attribute EventHandler onlevelchange;
+    readonly        attribute double              level;
+                    attribute EventHandler        onchargingchange;
+                    attribute EventHandler        onchargingtimechange;
+                    attribute EventHandler        ondischargingtimechange;
+                    attribute EventHandler        onlevelchange;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/hr-time.idl b/tests/wpt/web-platform-tests/interfaces/hr-time.idl
index 0e30c3f150f9..8179c66f44de 100644
--- a/tests/wpt/web-platform-tests/interfaces/hr-time.idl
+++ b/tests/wpt/web-platform-tests/interfaces/hr-time.idl
@@ -1,7 +1,7 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into reffy-reports
 // (https://github.com/tidoust/reffy-reports)
-// Source: High Resolution Time Level 2 (https://w3c.github.io/hr-time/)
+// Source: High Resolution Time (https://w3c.github.io/hr-time/)
 
 typedef double DOMHighResTimeStamp;
 
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index 486875ec274f..266574de63e8 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -1166,9 +1166,10 @@ dictionary SubmitEventInit : EventInit {
   HTMLElement? submitter = null;
 };
 
-[Exposed=Window,
- Constructor(DOMString type, optional FormDataEventInit eventInitDict = {})]
+[Exposed=Window]
 interface FormDataEvent : Event {
+  constructor(DOMString type, FormDataEventInit eventInitDict);
+
   readonly attribute FormData formData;
 };
 
@@ -2011,8 +2012,8 @@ interface mixin NavigatorLanguage {
 };
 
 interface mixin NavigatorContentUtils {
-  void registerProtocolHandler(DOMString scheme, USVString url, DOMString title);
-  void unregisterProtocolHandler(DOMString scheme, USVString url);
+  [SecureContext] void registerProtocolHandler(DOMString scheme, USVString url, DOMString title);
+  [SecureContext] void unregisterProtocolHandler(DOMString scheme, USVString url);
 };
 
 interface mixin NavigatorCookies {
diff --git a/tests/wpt/web-platform-tests/interfaces/media-playback-quality.idl b/tests/wpt/web-platform-tests/interfaces/media-playback-quality.idl
index 5a93de9f06c6..71c835677a76 100644
--- a/tests/wpt/web-platform-tests/interfaces/media-playback-quality.idl
+++ b/tests/wpt/web-platform-tests/interfaces/media-playback-quality.idl
@@ -10,7 +10,6 @@ partial interface HTMLVideoElement {
 [Exposed=Window]
 interface VideoPlaybackQuality {
   readonly attribute DOMHighResTimeStamp creationTime;
-  readonly attribute unsigned long corruptedVideoFrames;
   readonly attribute unsigned long droppedVideoFrames;
   readonly attribute unsigned long totalVideoFrames;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-depth.idl b/tests/wpt/web-platform-tests/interfaces/mediacapture-depth.idl
index 907940aed7de..4d7459bf2071 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediacapture-depth.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediacapture-depth.idl
@@ -20,7 +20,7 @@ partial dictionary MediaTrackConstraintSet {
 
 partial dictionary MediaTrackSettings {
     // Applies to both depth stream track and color stream track:
-    DOMString videoKind;
+    DOMString           videoKind;
 };
 
 enum VideoKindEnum {
diff --git a/tests/wpt/web-platform-tests/interfaces/mediacapture-fromelement.idl b/tests/wpt/web-platform-tests/interfaces/mediacapture-fromelement.idl
index fad2f8356dfe..7e1190950957 100644
--- a/tests/wpt/web-platform-tests/interfaces/mediacapture-fromelement.idl
+++ b/tests/wpt/web-platform-tests/interfaces/mediacapture-fromelement.idl
@@ -4,14 +4,14 @@
 // Source: Media Capture from DOM Elements (https://w3c.github.io/mediacapture-fromelement/)
 
 partial interface HTMLMediaElement {
-    MediaStream captureStream();
+    MediaStream captureStream ();
 };
 
 partial interface HTMLCanvasElement {
-    MediaStream captureStream(optional double frameRequestRate);
+    MediaStream captureStream (optional double frameRequestRate);
 };
 
 [Exposed=Window] interface CanvasCaptureMediaStreamTrack : MediaStreamTrack {
     readonly        attribute HTMLCanvasElement canvas;
-    void requestFrame();
+    void requestFrame ();
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/navigation-timing.idl b/tests/wpt/web-platform-tests/interfaces/navigation-timing.idl
index 7e76a3566173..57cea306d9e3 100644
--- a/tests/wpt/web-platform-tests/interfaces/navigation-timing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/navigation-timing.idl
@@ -13,8 +13,8 @@ interface PerformanceNavigationTiming : PerformanceResourceTiming {
     readonly        attribute DOMHighResTimeStamp domComplete;
     readonly        attribute DOMHighResTimeStamp loadEventStart;
     readonly        attribute DOMHighResTimeStamp loadEventEnd;
-    readonly        attribute NavigationType type;
-    readonly        attribute unsigned short redirectCount;
+    readonly        attribute NavigationType      type;
+    readonly        attribute unsigned short      redirectCount;
     [Default] object toJSON();
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/payment-handler.idl b/tests/wpt/web-platform-tests/interfaces/payment-handler.idl
index aadaecc17346..824210a5c183 100644
--- a/tests/wpt/web-platform-tests/interfaces/payment-handler.idl
+++ b/tests/wpt/web-platform-tests/interfaces/payment-handler.idl
@@ -23,12 +23,12 @@ enum PaymentDelegation {
 
 [SecureContext, Exposed=(Window,Worker)]
 interface PaymentInstruments {
-    Promise<boolean> delete(DOMString instrumentKey);
-    Promise<any> get(DOMString instrumentKey);
-    Promise<sequence<DOMString>> keys();
-    Promise<boolean> has(DOMString instrumentKey);
-    Promise<void> set(DOMString instrumentKey, PaymentInstrument details);
-    Promise<void> clear();
+  Promise<boolean> delete(DOMString instrumentKey);
+  Promise<any> get(DOMString instrumentKey);
+  Promise<sequence<DOMString>>  keys();
+  Promise<boolean> has(DOMString instrumentKey);
+  Promise<void> set(DOMString instrumentKey, PaymentInstrument details);
+  Promise<void> clear();
 };
 
 dictionary PaymentInstrument {
@@ -50,7 +50,7 @@ partial interface ServiceWorkerGlobalScope {
 
 [Exposed=ServiceWorker]
 interface CanMakePaymentEvent : ExtendableEvent {
-  constructor(DOMString type, CanMakePaymentEventInit eventInitDict);
+  constructor(DOMString type, optional CanMakePaymentEventInit eventInitDict = {});
   readonly attribute USVString topOrigin;
   readonly attribute USVString paymentRequestOrigin;
   readonly attribute FrozenArray<PaymentMethodData> methodData;
@@ -78,7 +78,7 @@ dictionary PaymentRequestDetailsUpdate {
 
 [Exposed=ServiceWorker]
 interface PaymentRequestEvent : ExtendableEvent {
-  constructor(DOMString type, PaymentRequestEventInit eventInitDict);
+  constructor(DOMString type, optional PaymentRequestEventInit eventInitDict = {});
   readonly attribute USVString topOrigin;
   readonly attribute USVString paymentRequestOrigin;
   readonly attribute DOMString paymentRequestId;
@@ -91,7 +91,7 @@ interface PaymentRequestEvent : ExtendableEvent {
   readonly attribute FrozenArray<PaymentShippingOption>? shippingOptions;
   Promise<WindowClient?> openWindow(USVString url);
   Promise<PaymentRequestDetailsUpdate?> changePaymentMethod(DOMString methodName, optional object? methodDetails = null);
-  Promise<PaymentRequestDetailsUpdate?> changeShippingAddress(AddressInit shippingAddress);
+  Promise<PaymentRequestDetailsUpdate?> changeShippingAddress(optional AddressInit shippingAddress = {});
   Promise<PaymentRequestDetailsUpdate?> changeShippingOption(DOMString shippingOption);
   void respondWith(Promise<PaymentHandlerResponse> handlerResponsePromise);
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl b/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl
index 3ce538c846c6..d3783858578c 100644
--- a/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl
+++ b/tests/wpt/web-platform-tests/interfaces/performance-timeline.idl
@@ -4,16 +4,16 @@
 // Source: Performance Timeline Level 2 (https://w3c.github.io/performance-timeline/)
 
 partial interface Performance {
-  PerformanceEntryList getEntries();
-  PerformanceEntryList getEntriesByType(DOMString type);
-  PerformanceEntryList getEntriesByName(DOMString name, optional DOMString type);
+  PerformanceEntryList getEntries ();
+  PerformanceEntryList getEntriesByType (DOMString type);
+  PerformanceEntryList getEntriesByName (DOMString name, optional DOMString type);
 };
 typedef sequence<PerformanceEntry> PerformanceEntryList;
 
 [Exposed=(Window,Worker)]
 interface PerformanceEntry {
-  readonly    attribute DOMString name;
-  readonly    attribute DOMString entryType;
+  readonly    attribute DOMString           name;
+  readonly    attribute DOMString           entryType;
   readonly    attribute DOMHighResTimeStamp startTime;
   readonly    attribute DOMHighResTimeStamp duration;
   [Default] object toJSON();
@@ -39,6 +39,6 @@ dictionary PerformanceObserverInit {
 [Exposed=(Window,Worker)]
 interface PerformanceObserverEntryList {
   PerformanceEntryList getEntries();
-  PerformanceEntryList getEntriesByType(DOMString type);
-  PerformanceEntryList getEntriesByName(DOMString name, optional DOMString type);
+  PerformanceEntryList getEntriesByType (DOMString type);
+  PerformanceEntryList getEntriesByName (DOMString name, optional DOMString type);
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/pointerevents-extension.idl b/tests/wpt/web-platform-tests/interfaces/pointerevents-extension.idl
deleted file mode 100644
index 1eb486d63a86..000000000000
--- a/tests/wpt/web-platform-tests/interfaces/pointerevents-extension.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into reffy-reports
-// (https://github.com/tidoust/reffy-reports)
-// Source: PointerEvents - Level 2 - Extensions (https://w3c.github.io/pointerevents/extension.html)
-
-partial dictionary PointerEventInit {
-    sequence<PointerEvent> coalescedEvents = [];
-    sequence<PointerEvent> predictedEvents = [];
-};
-
-partial interface PointerEvent {
-    sequence<PointerEvent> getCoalescedEvents();
-    sequence<PointerEvent> getPredictedEvents();
-};
diff --git a/tests/wpt/web-platform-tests/interfaces/pointerevents.idl b/tests/wpt/web-platform-tests/interfaces/pointerevents.idl
index 85a25aa444e3..f4405438632b 100644
--- a/tests/wpt/web-platform-tests/interfaces/pointerevents.idl
+++ b/tests/wpt/web-platform-tests/interfaces/pointerevents.idl
@@ -14,6 +14,8 @@ dictionary PointerEventInit : MouseEventInit {
     long        twist = 0;
     DOMString   pointerType = "";
     boolean     isPrimary = false;
+    sequence<PointerEvent> coalescedEvents = [];
+    sequence<PointerEvent> predictedEvents = [];
 };
 
 [Exposed=Window]
@@ -29,12 +31,14 @@ interface PointerEvent : MouseEvent {
     readonly        attribute long        twist;
     readonly        attribute DOMString   pointerType;
     readonly        attribute boolean     isPrimary;
+    sequence<PointerEvent> getCoalescedEvents();
+    sequence<PointerEvent> getPredictedEvents();
 };
 
 partial interface Element {
-  void setPointerCapture(long pointerId);
-  void releasePointerCapture(long pointerId);
-  boolean hasPointerCapture(long pointerId);
+  void setPointerCapture (long pointerId);
+  void releasePointerCapture (long pointerId);
+  boolean hasPointerCapture (long pointerId);
 };
 
 partial interface mixin GlobalEventHandlers {
diff --git a/tests/wpt/web-platform-tests/interfaces/pointerlock.idl b/tests/wpt/web-platform-tests/interfaces/pointerlock.idl
index 13f7a8be4822..12e984b33c6a 100644
--- a/tests/wpt/web-platform-tests/interfaces/pointerlock.idl
+++ b/tests/wpt/web-platform-tests/interfaces/pointerlock.idl
@@ -14,7 +14,7 @@ partial interface Document {
 };
 
 partial interface mixin DocumentOrShadowRoot {
-  readonly attribute Element? pointerLockElement;
+  readonly attribute Element ? pointerLockElement;
 };
 
 partial interface MouseEvent {
diff --git a/tests/wpt/web-platform-tests/interfaces/remote-playback.idl b/tests/wpt/web-platform-tests/interfaces/remote-playback.idl
index 8321e59fb632..2b0d85316c20 100644
--- a/tests/wpt/web-platform-tests/interfaces/remote-playback.idl
+++ b/tests/wpt/web-platform-tests/interfaces/remote-playback.idl
@@ -23,7 +23,7 @@ enum RemotePlaybackState {
   "disconnected"
 };
 
-callback RemotePlaybackAvailabilityCallback = void (boolean available);
+callback RemotePlaybackAvailabilityCallback = void(boolean available);
 
 partial interface HTMLMediaElement {
   [SameObject] readonly attribute RemotePlayback remote;
diff --git a/tests/wpt/web-platform-tests/interfaces/requestidlecallback.idl b/tests/wpt/web-platform-tests/interfaces/requestidlecallback.idl
index c763b50bde78..b485dc07805f 100644
--- a/tests/wpt/web-platform-tests/interfaces/requestidlecallback.idl
+++ b/tests/wpt/web-platform-tests/interfaces/requestidlecallback.idl
@@ -11,10 +11,8 @@ partial interface Window {
 dictionary IdleRequestOptions {
   unsigned long timeout;
 };
-
 [Exposed=Window] interface IdleDeadline {
   DOMHighResTimeStamp timeRemaining();
   readonly attribute boolean didTimeout;
 };
-
 callback IdleRequestCallback = void (IdleDeadline deadline);
diff --git a/tests/wpt/web-platform-tests/interfaces/resize-observer.idl b/tests/wpt/web-platform-tests/interfaces/resize-observer.idl
index 8018fc4b22be..9ac157a6328c 100644
--- a/tests/wpt/web-platform-tests/interfaces/resize-observer.idl
+++ b/tests/wpt/web-platform-tests/interfaces/resize-observer.idl
@@ -25,9 +25,9 @@ callback ResizeObserverCallback = void (sequence<ResizeObserverEntry> entries, R
 interface ResizeObserverEntry {
     readonly attribute Element target;
     readonly attribute DOMRectReadOnly contentRect;
-    readonly attribute ResizeObserverSize borderBoxSize;
-    readonly attribute ResizeObserverSize contentBoxSize;
-    readonly attribute ResizeObserverSize devicePixelContentBoxSize;
+    readonly attribute sequence<ResizeObserverSize> borderBoxSize;
+    readonly attribute sequence<ResizeObserverSize> contentBoxSize;
+    readonly attribute sequence<ResizeObserverSize> devicePixelContentBoxSize;
 };
 
 interface ResizeObserverSize {
@@ -40,5 +40,5 @@ interface ResizeObserverSize {
 interface ResizeObservation {
     readonly attribute Element target;
     readonly attribute ResizeObserverBoxOptions observedBox;
-    readonly attribute ResizeObserverSize lastReportedSize;
+    readonly attribute sequence<ResizeObserverSize> lastReportedSizes;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/resource-timing.idl b/tests/wpt/web-platform-tests/interfaces/resource-timing.idl
index fc14253f5e9a..cbc17683b260 100644
--- a/tests/wpt/web-platform-tests/interfaces/resource-timing.idl
+++ b/tests/wpt/web-platform-tests/interfaces/resource-timing.idl
@@ -5,8 +5,8 @@
 
 [Exposed=(Window,Worker)]
 interface PerformanceResourceTiming : PerformanceEntry {
-    readonly        attribute DOMString initiatorType;
-    readonly        attribute DOMString nextHopProtocol;
+    readonly        attribute DOMString           initiatorType;
+    readonly        attribute DOMString           nextHopProtocol;
     readonly        attribute DOMHighResTimeStamp workerStart;
     readonly        attribute DOMHighResTimeStamp redirectStart;
     readonly        attribute DOMHighResTimeStamp redirectEnd;
@@ -19,14 +19,14 @@ interface PerformanceResourceTiming : PerformanceEntry {
     readonly        attribute DOMHighResTimeStamp requestStart;
     readonly        attribute DOMHighResTimeStamp responseStart;
     readonly        attribute DOMHighResTimeStamp responseEnd;
-    readonly        attribute unsigned long long transferSize;
-    readonly        attribute unsigned long long encodedBodySize;
-    readonly        attribute unsigned long long decodedBodySize;
+    readonly        attribute unsigned long long  transferSize;
+    readonly        attribute unsigned long long  encodedBodySize;
+    readonly        attribute unsigned long long  decodedBodySize;
     [Default] object toJSON();
 };
 
 partial interface Performance {
-  void clearResourceTimings();
-  void setResourceTimingBufferSize(unsigned long maxSize);
+  void clearResourceTimings ();
+  void setResourceTimingBufferSize (unsigned long maxSize);
               attribute EventHandler onresourcetimingbufferfull;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/vibration.idl b/tests/wpt/web-platform-tests/interfaces/vibration.idl
index f4191d91d36f..cc5cd194b558 100644
--- a/tests/wpt/web-platform-tests/interfaces/vibration.idl
+++ b/tests/wpt/web-platform-tests/interfaces/vibration.idl
@@ -6,5 +6,5 @@
 typedef (unsigned long or sequence<unsigned long>) VibratePattern;
 
 partial interface Navigator {
-    boolean vibrate(VibratePattern pattern);
+    boolean vibrate (VibratePattern pattern);
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/wake-lock.idl b/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
index b66c415e6aad..85d1863fa6f6 100644
--- a/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
+++ b/tests/wpt/web-platform-tests/interfaces/wake-lock.idl
@@ -19,12 +19,12 @@ partial interface WorkerNavigator {
   [SameObject] readonly attribute WakeLock wakeLock;
 };
 
-[SecureContext, Exposed=(DedicatedWorker,Window)]
+[SecureContext, Exposed=(DedicatedWorker, Window)]
 interface WakeLock {
   Promise<WakeLockSentinel> request(WakeLockType type);
 };
 
-[SecureContext, Exposed=(DedicatedWorker,Window)]
+[SecureContext, Exposed=(DedicatedWorker, Window)]
 interface WakeLockSentinel : EventTarget {
   readonly attribute WakeLockType type;
   Promise<void> release();
diff --git a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl b/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
index 9f726ece289d..340dab647d6c 100644
--- a/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/web-nfc.idl
@@ -19,7 +19,7 @@ interface NDEFRecord {
 
   readonly attribute USVString recordType;
   readonly attribute USVString? mediaType;
-  readonly attribute USVString id;
+  readonly attribute USVString? id;
   readonly attribute DataView? data;
 
   readonly attribute USVString? encoding;
diff --git a/tests/wpt/web-platform-tests/interfaces/webaudio.idl b/tests/wpt/web-platform-tests/interfaces/webaudio.idl
index 3869d5d14a66..674673d90b1e 100644
--- a/tests/wpt/web-platform-tests/interfaces/webaudio.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webaudio.idl
@@ -585,7 +585,7 @@ dictionary AudioWorkletNodeOptions : AudioNodeOptions {
 
 [Exposed=AudioWorklet]
 interface AudioWorkletProcessor {
-  constructor (optional AudioWorkletNodeOptions options = {});
+  constructor ();
   readonly attribute MessagePort port;
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/webmidi.idl b/tests/wpt/web-platform-tests/interfaces/webmidi.idl
index aa3b1ac21c89..096e7a1db11c 100644
--- a/tests/wpt/web-platform-tests/interfaces/webmidi.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webmidi.idl
@@ -14,21 +14,21 @@ dictionary MIDIOptions {
 };
 
 [SecureContext, Exposed=Window] interface MIDIInputMap {
-  readonly maplike<DOMString, MIDIInput>;
+  readonly maplike <DOMString, MIDIInput>;
 };
 
 [SecureContext, Exposed=Window] interface MIDIOutputMap {
-  readonly maplike<DOMString, MIDIOutput>;
+  readonly maplike <DOMString, MIDIOutput>;
 };
 
-[SecureContext, Exposed=Window] interface MIDIAccess : EventTarget {
+[SecureContext, Exposed=Window] interface MIDIAccess: EventTarget {
   readonly attribute MIDIInputMap inputs;
   readonly attribute MIDIOutputMap outputs;
   attribute EventHandler onstatechange;
   readonly attribute boolean sysexEnabled;
 };
 
-[SecureContext, Exposed=Window] interface MIDIPort : EventTarget {
+[SecureContext, Exposed=Window] interface MIDIPort: EventTarget {
   readonly attribute DOMString id;
   readonly attribute DOMString? manufacturer;
   readonly attribute DOMString? name;
@@ -37,11 +37,11 @@ dictionary MIDIOptions {
   readonly attribute MIDIPortDeviceState state;
   readonly attribute MIDIPortConnectionState connection;
   attribute EventHandler onstatechange;
-  Promise<MIDIPort> open();
-  Promise<MIDIPort> close();
+  Promise <MIDIPort> open();
+  Promise <MIDIPort> close();
 };
 
-[SecureContext, Exposed=Window] interface MIDIInput : MIDIPort {
+[SecureContext, Exposed=Window] interface MIDIInput: MIDIPort {
   attribute EventHandler onmidimessage;
 };
 
@@ -72,7 +72,7 @@ interface MIDIMessageEvent : Event {
   readonly attribute Uint8Array data;
 };
 
-dictionary MIDIMessageEventInit : EventInit {
+dictionary MIDIMessageEventInit: EventInit {
   Uint8Array data;
 };
 
@@ -82,6 +82,6 @@ interface MIDIConnectionEvent : Event {
   readonly attribute MIDIPort port;
 };
 
-dictionary MIDIConnectionEventInit : EventInit {
+dictionary MIDIConnectionEventInit: EventInit {
   MIDIPort port;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl b/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl
index 23f02c3f12b6..d1f2a6547609 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc-identity.idl
@@ -3,9 +3,10 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: Identity for WebRTC 1.0 (https://w3c.github.io/webrtc-identity/identity.html)
 
-[Global, Exposed=RTCIdentityProviderGlobalScope]
+[Global,
+ Exposed=RTCIdentityProviderGlobalScope]
 interface RTCIdentityProviderGlobalScope : WorkerGlobalScope {
-    readonly        attribute RTCIdentityProviderRegistrar rtcIdentityProvider;
+    readonly attribute RTCIdentityProviderRegistrar rtcIdentityProvider;
 };
 
 [Exposed=RTCIdentityProviderGlobalScope]
@@ -18,13 +19,16 @@ dictionary RTCIdentityProvider {
     required ValidateAssertionCallback validateAssertion;
 };
 
-callback GenerateAssertionCallback = Promise<RTCIdentityAssertionResult> (DOMString contents, DOMString origin, RTCIdentityProviderOptions options);
+callback GenerateAssertionCallback = Promise<RTCIdentityAssertionResult> (DOMString contents,
+DOMString origin,
+RTCIdentityProviderOptions options);
 
-callback ValidateAssertionCallback = Promise<RTCIdentityValidationResult> (DOMString assertion, DOMString origin);
+callback ValidateAssertionCallback = Promise<RTCIdentityValidationResult> (DOMString assertion,
+DOMString origin);
 
 dictionary RTCIdentityAssertionResult {
     required RTCIdentityProviderDetails idp;
-    required DOMString assertion;
+    required DOMString                  assertion;
 };
 
 dictionary RTCIdentityProviderDetails {
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl b/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl
index 3e58254baa45..dbb1c5773c56 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc-stats.idl
@@ -15,9 +15,11 @@ enum RTCStatsType {
 "data-channel",
 "stream",
 "track",
+"transceiver",
 "sender",
 "receiver",
 "transport",
+"sctp-transport",
 "candidate-pair",
 "local-candidate",
 "remote-candidate",
@@ -26,20 +28,20 @@ enum RTCStatsType {
 };
 
 dictionary RTCRtpStreamStats : RTCStats {
-             unsigned long ssrc;
-             DOMString kind;
-             DOMString transportId;
-             DOMString codecId;
+             unsigned long       ssrc;
+             DOMString           kind;
+             DOMString           transportId;
+             DOMString           codecId;
 };
 
 dictionary RTCCodecStats : RTCStats {
              unsigned long payloadType;
-             RTCCodecType codecType;
-             DOMString transportId;
-             DOMString mimeType;
+             RTCCodecType  codecType;
+             DOMString     transportId;
+             DOMString     mimeType;
              unsigned long clockRate;
              unsigned long channels;
-             DOMString sdpFmtpLine;
+             DOMString     sdpFmtpLine;
 };
 
 enum RTCCodecType {
@@ -48,124 +50,126 @@ enum RTCCodecType {
 };
 
 dictionary RTCReceivedRtpStreamStats : RTCRtpStreamStats {
-             unsigned long long packetsReceived;
-             long long packetsLost;
-             double jitter;
-             unsigned long long packetsDiscarded;
-             unsigned long long packetsRepaired;
-             unsigned long long burstPacketsLost;
-             unsigned long long burstPacketsDiscarded;
-             unsigned long burstLossCount;
-             unsigned long burstDiscardCount;
-             double burstLossRate;
-             double burstDiscardRate;
-             double gapLossRate;
-             double gapDiscardRate;
-             unsigned long framesDropped;
-             unsigned long partialFramesLost;
-             unsigned long fullFramesLost;
+             unsigned long long   packetsReceived;
+             long long            packetsLost;
+             double               jitter;
+             unsigned long long   packetsDiscarded;
+             unsigned long long   packetsRepaired;
+             unsigned long long   burstPacketsLost;
+             unsigned long long   burstPacketsDiscarded;
+             unsigned long        burstLossCount;
+             unsigned long        burstDiscardCount;
+             double               burstLossRate;
+             double               burstDiscardRate;
+             double               gapLossRate;
+             double               gapDiscardRate;
+             unsigned long        framesDropped;
+             unsigned long        partialFramesLost;
+             unsigned long        fullFramesLost;
 
 };
 
 dictionary RTCInboundRtpStreamStats : RTCReceivedRtpStreamStats {
- DOMString trackId;
- DOMString receiverId;
- DOMString remoteId;
- unsigned long framesDecoded;
- unsigned long keyFramesDecoded;
- unsigned long frameWidth;
- unsigned long frameHeight;
- double framesPerSecond;
- unsigned long long qpSum;
- double totalDecodeTime;
- double totalInterFrameDelay;
- double totalSquaredInterFrameDelay;
- boolean voiceActivityFlag;
- DOMHighResTimeStamp lastPacketReceivedTimestamp;
- double averageRtcpInterval;
- unsigned long long headerBytesReceived;
- unsigned long long fecPacketsReceived;
- unsigned long long fecPacketsDiscarded;
- unsigned long long bytesReceived;
- unsigned long long packetsFailedDecryption;
- unsigned long long packetsDuplicated;
+ DOMString            trackId;
+ DOMString            receiverId;
+ DOMString            remoteId;
+ unsigned long        framesDecoded;
+ unsigned long        keyFramesDecoded;
+ unsigned long        frameWidth;
+ unsigned long        frameHeight;
+ unsigned long        frameBitDepth;
+ double               framesPerSecond;
+ unsigned long long   qpSum;
+ double               totalDecodeTime;
+ double               totalInterFrameDelay;
+ double               totalSquaredInterFrameDelay;
+ boolean              voiceActivityFlag;
+ DOMHighResTimeStamp  lastPacketReceivedTimestamp;
+ double               averageRtcpInterval;
+ unsigned long long   headerBytesReceived;
+ unsigned long long   fecPacketsReceived;
+ unsigned long long   fecPacketsDiscarded;
+ unsigned long long   bytesReceived;
+ unsigned long long   packetsFailedDecryption;
+ unsigned long long   packetsDuplicated;
  record<USVString, unsigned long long> perDscpPacketsReceived;
- unsigned long nackCount;
- unsigned long firCount;
- unsigned long pliCount;
- unsigned long sliCount;
- DOMHighResTimeStamp estimatedPlayoutTimestamp;
- double jitterBufferDelay;
- unsigned long long jitterBufferEmittedCount;
- unsigned long long totalSamplesReceived;
- unsigned long long samplesDecodedWithSilk;
- unsigned long long samplesDecodedWithCelt;
- unsigned long long concealedSamples;
- unsigned long long silentConcealedSamples;
- unsigned long long concealmentEvents;
- unsigned long long insertedSamplesForDeceleration;
- unsigned long long removedSamplesForAcceleration;
- double audioLevel;
- double totalAudioEnergy;
- double totalSamplesDuration;
- unsigned long framesReceived;
- DOMString decoderImplementation;
+ unsigned long        nackCount;
+ unsigned long        firCount;
+ unsigned long        pliCount;
+ unsigned long        sliCount;
+ DOMHighResTimeStamp  estimatedPlayoutTimestamp;
+ double               jitterBufferDelay;
+ unsigned long long   jitterBufferEmittedCount;
+ unsigned long long   totalSamplesReceived;
+ unsigned long long   samplesDecodedWithSilk;
+ unsigned long long   samplesDecodedWithCelt;
+ unsigned long long   concealedSamples;
+ unsigned long long   silentConcealedSamples;
+ unsigned long long   concealmentEvents;
+ unsigned long long   insertedSamplesForDeceleration;
+ unsigned long long   removedSamplesForAcceleration;
+ double               audioLevel;
+ double               totalAudioEnergy;
+ double               totalSamplesDuration;
+ unsigned long        framesReceived;
+ DOMString            decoderImplementation;
 };
 
 dictionary RTCRemoteInboundRtpStreamStats : RTCReceivedRtpStreamStats {
-             DOMString localId;
-             double roundTripTime;
-             double totalRoundTripTime;
-             double fractionLost;
-             unsigned long long reportsReceived;
-             unsigned long long roundTripTimeMeasurements;
+             DOMString            localId;
+             double               roundTripTime;
+             double               totalRoundTripTime;
+             double               fractionLost;
+             unsigned long long   reportsReceived;
+             unsigned long long   roundTripTimeMeasurements;
 };
 
 dictionary RTCSentRtpStreamStats : RTCRtpStreamStats {
-             unsigned long packetsSent;
+             unsigned long      packetsSent;
              unsigned long long bytesSent;
 };
 
 dictionary RTCOutboundRtpStreamStats : RTCSentRtpStreamStats {
-             DOMString trackId;
-             DOMString mediaSourceId;
-             DOMString senderId;
-             DOMString remoteId;
-             DOMString rid;
-             DOMHighResTimeStamp lastPacketSentTimestamp;
-             unsigned long long headerBytesSent;
-             unsigned long packetsDiscardedOnSend;
-             unsigned long long bytesDiscardedOnSend;
-             unsigned long fecPacketsSent;
-             unsigned long long retransmittedPacketsSent;
-             unsigned long long retransmittedBytesSent;
-             double targetBitrate;
-             unsigned long long totalEncodedBytesTarget;
-             unsigned long frameWidth;
-             unsigned long frameHeight;
-             double framesPerSecond;
-             unsigned long framesSent;
-             unsigned long hugeFramesSent;
-             unsigned long framesEncoded;
-             unsigned long keyFramesEncoded;
-             unsigned long framesDiscardedOnSend;
-             unsigned long long qpSum;
-             unsigned long long totalSamplesSent;
-             unsigned long long samplesEncodedWithSilk;
-             unsigned long long samplesEncodedWithCelt;
-             boolean voiceActivityFlag;
-             double totalEncodeTime;
-             double totalPacketSendDelay;
-             double averageRtcpInterval;
-             RTCQualityLimitationReason qualityLimitationReason;
+             DOMString            trackId;
+             DOMString            mediaSourceId;
+             DOMString            senderId;
+             DOMString            remoteId;
+             DOMString            rid;
+             DOMHighResTimeStamp  lastPacketSentTimestamp;
+             unsigned long long   headerBytesSent;
+             unsigned long        packetsDiscardedOnSend;
+             unsigned long long   bytesDiscardedOnSend;
+             unsigned long        fecPacketsSent;
+             unsigned long long   retransmittedPacketsSent;
+             unsigned long long   retransmittedBytesSent;
+             double               targetBitrate;
+             unsigned long long   totalEncodedBytesTarget;
+             unsigned long        frameWidth;
+             unsigned long        frameHeight;
+             unsigned long        frameBitDepth;
+             double               framesPerSecond;
+             unsigned long        framesSent;
+             unsigned long        hugeFramesSent;
+             unsigned long        framesEncoded;
+             unsigned long        keyFramesEncoded;
+             unsigned long        framesDiscardedOnSend;
+             unsigned long long   qpSum;
+             unsigned long long   totalSamplesSent;
+             unsigned long long   samplesEncodedWithSilk;
+             unsigned long long   samplesEncodedWithCelt;
+             boolean              voiceActivityFlag;
+             double               totalEncodeTime;
+             double               totalPacketSendDelay;
+             double               averageRtcpInterval;
+             RTCQualityLimitationReason                 qualityLimitationReason;
              record<DOMString, double> qualityLimitationDurations;
-             unsigned long qualityLimitationResolutionChanges;
+             unsigned long        qualityLimitationResolutionChanges;
              record<USVString, unsigned long long> perDscpPacketsSent;
-             unsigned long nackCount;
-             unsigned long firCount;
-             unsigned long pliCount;
-             unsigned long sliCount;
-             DOMString encoderImplementation;
+             unsigned long        nackCount;
+             unsigned long        firCount;
+             unsigned long        pliCount;
+             unsigned long        sliCount;
+             DOMString            encoderImplementation;
 };
 
 enum RTCQualityLimitationReason {
@@ -176,36 +180,37 @@ enum RTCQualityLimitationReason {
 };
 
 dictionary RTCRemoteOutboundRtpStreamStats : RTCSentRtpStreamStats {
-             DOMString localId;
+             DOMString           localId;
              DOMHighResTimeStamp remoteTimestamp;
-             unsigned long long reportsSent;
+             unsigned long long  reportsSent;
 };
 
 dictionary RTCMediaSourceStats : RTCStats {
-             DOMString trackIdentifier;
-             DOMString kind;
+             DOMString       trackIdentifier;
+             DOMString       kind;
 };
 
 dictionary RTCAudioSourceStats : RTCMediaSourceStats {
-              double audioLevel;
-              double totalAudioEnergy;
-              double totalSamplesDuration;
-              double echoReturnLoss;
-              double echoReturnLossEnhancement;
+              double              audioLevel;
+              double              totalAudioEnergy;
+              double              totalSamplesDuration;
+              double              echoReturnLoss;
+              double              echoReturnLossEnhancement;
 };
 
 dictionary RTCVideoSourceStats : RTCMediaSourceStats {
-             unsigned long width;
-             unsigned long height;
-             unsigned long frames;
-             unsigned long framesPerSecond;
+             unsigned long   width;
+             unsigned long   height;
+             unsigned long   bitDepth;
+             unsigned long   frames;
+             unsigned long   framesPerSecond;
 };
 
 dictionary RTCRtpContributingSourceStats : RTCStats {
              unsigned long contributorSsrc;
-             DOMString inboundRtpStreamId;
+             DOMString     inboundRtpStreamId;
              unsigned long packetsContributedTo;
-             double audioLevel;
+             double        audioLevel;
 };
 
 dictionary RTCPeerConnectionStats : RTCStats {
@@ -216,23 +221,29 @@ dictionary RTCPeerConnectionStats : RTCStats {
 };
 
 dictionary RTCMediaStreamStats : RTCStats {
-             DOMString streamIdentifier;
+             DOMString           streamIdentifier;
              sequence<DOMString> trackIds;
 };
 
+dictionary RTCRtpTransceiverStats {
+    DOMString senderId;
+    DOMString receiverId;
+    DOMString mid;
+};
+
 dictionary RTCMediaHandlerStats : RTCStats {
-             DOMString trackIdentifier;
-             boolean remoteSource;
-             boolean ended;
-             DOMString kind;
-             RTCPriorityType priority;
+             DOMString           trackIdentifier;
+             boolean             remoteSource;
+             boolean             ended;
+             DOMString           kind;
+             RTCPriorityType     priority;
 };
 
 dictionary RTCVideoHandlerStats : RTCMediaHandlerStats {
 };
 
 dictionary RTCVideoSenderStats : RTCVideoHandlerStats {
-             DOMString mediaSourceId;
+             DOMString           mediaSourceId;
 };
 
 dictionary RTCSenderVideoTrackAttachmentStats : RTCVideoSenderStats {
@@ -245,7 +256,7 @@ dictionary RTCAudioHandlerStats : RTCMediaHandlerStats {
 };
 
 dictionary RTCAudioSenderStats : RTCAudioHandlerStats {
-             DOMString mediaSourceId;
+             DOMString           mediaSourceId;
 };
 
 dictionary RTCSenderAudioTrackAttachmentStats : RTCAudioSenderStats {
@@ -255,45 +266,49 @@ dictionary RTCAudioReceiverStats : RTCAudioHandlerStats {
 };
 
 dictionary RTCDataChannelStats : RTCStats {
-             DOMString label;
-             DOMString protocol;
-             long dataChannelIdentifier;
-             DOMString transportId;
+             DOMString           label;
+             DOMString           protocol;
+             long                dataChannelIdentifier;
+             DOMString           transportId;
              RTCDataChannelState state;
-             unsigned long messagesSent;
-             unsigned long long bytesSent;
-             unsigned long messagesReceived;
-             unsigned long long bytesReceived;
+             unsigned long       messagesSent;
+             unsigned long long  bytesSent;
+             unsigned long       messagesReceived;
+             unsigned long long  bytesReceived;
 };
 
 dictionary RTCTransportStats : RTCStats {
-             unsigned long long packetsSent;
-             unsigned long long packetsReceived;
-             unsigned long long bytesSent;
-             unsigned long long bytesReceived;
-             DOMString rtcpTransportStatsId;
-             RTCIceRole iceRole;
+             unsigned long long    packetsSent;
+             unsigned long long    packetsReceived;
+             unsigned long long    bytesSent;
+             unsigned long long    bytesReceived;
+             DOMString             rtcpTransportStatsId;
+             RTCIceRole            iceRole;
              RTCDtlsTransportState dtlsState;
-             DOMString selectedCandidatePairId;
-             DOMString localCertificateId;
-             DOMString remoteCertificateId;
-             DOMString tlsVersion;
-             DOMString dtlsCipher;
-             DOMString srtpCipher;
-             DOMString tlsGroup;
-             unsigned long selectedCandidatePairChanges;
+             DOMString             selectedCandidatePairId;
+             DOMString             localCertificateId;
+             DOMString             remoteCertificateId;
+             DOMString             tlsVersion;
+             DOMString             dtlsCipher;
+             DOMString             srtpCipher;
+             DOMString             tlsGroup;
+             unsigned long         selectedCandidatePairChanges;
+};
+
+dictionary RTCSctpTransportStats : RTCStats {
+    double smoothedRoundTripTime;
 };
 
 dictionary RTCIceCandidateStats : RTCStats {
-             DOMString transportId;
-             RTCNetworkType networkType;
-             DOMString? address;
-             long port;
-             DOMString protocol;
-             RTCIceCandidateType candidateType;
-             long priority;
-             DOMString url;
-             DOMString relayProtocol;
+             DOMString                transportId;
+             RTCNetworkType           networkType;
+             DOMString?               address;
+             long                     port;
+             DOMString                protocol;
+             RTCIceCandidateType      candidateType;
+             long                     priority;
+             DOMString                url;
+             DOMString                relayProtocol;
 };
 
 enum RTCNetworkType {
@@ -307,35 +322,35 @@ enum RTCNetworkType {
 };
 
 dictionary RTCIceCandidatePairStats : RTCStats {
-             DOMString transportId;
-             DOMString localCandidateId;
-             DOMString remoteCandidateId;
+             DOMString                     transportId;
+             DOMString                     localCandidateId;
+             DOMString                     remoteCandidateId;
              RTCStatsIceCandidatePairState state;
-             boolean nominated;
-             unsigned long long packetsSent;
-             unsigned long long packetsReceived;
-             unsigned long long bytesSent;
-             unsigned long long bytesReceived;
-             DOMHighResTimeStamp lastPacketSentTimestamp;
-             DOMHighResTimeStamp lastPacketReceivedTimestamp;
-             DOMHighResTimeStamp firstRequestTimestamp;
-             DOMHighResTimeStamp lastRequestTimestamp;
-             DOMHighResTimeStamp lastResponseTimestamp;
-             double totalRoundTripTime;
-             double currentRoundTripTime;
-             double availableOutgoingBitrate;
-             double availableIncomingBitrate;
-             unsigned long circuitBreakerTriggerCount;
-             unsigned long long requestsReceived;
-             unsigned long long requestsSent;
-             unsigned long long responsesReceived;
-             unsigned long long responsesSent;
-             unsigned long long retransmissionsReceived;
-             unsigned long long retransmissionsSent;
-             unsigned long long consentRequestsSent;
-             DOMHighResTimeStamp consentExpiredTimestamp;
-             unsigned long packetsDiscardedOnSend;
-             unsigned long long bytesDiscardedOnSend;
+             boolean                       nominated;
+             unsigned long long            packetsSent;
+             unsigned long long            packetsReceived;
+             unsigned long long            bytesSent;
+             unsigned long long            bytesReceived;
+             DOMHighResTimeStamp           lastPacketSentTimestamp;
+             DOMHighResTimeStamp           lastPacketReceivedTimestamp;
+             DOMHighResTimeStamp           firstRequestTimestamp;
+             DOMHighResTimeStamp           lastRequestTimestamp;
+             DOMHighResTimeStamp           lastResponseTimestamp;
+             double                        totalRoundTripTime;
+             double                        currentRoundTripTime;
+             double                        availableOutgoingBitrate;
+             double                        availableIncomingBitrate;
+             unsigned long                 circuitBreakerTriggerCount;
+             unsigned long long            requestsReceived;
+             unsigned long long            requestsSent;
+             unsigned long long            responsesReceived;
+             unsigned long long            responsesSent;
+             unsigned long long            retransmissionsReceived;
+             unsigned long long            retransmissionsSent;
+             unsigned long long            consentRequestsSent;
+             DOMHighResTimeStamp           consentExpiredTimestamp;
+             unsigned long                 packetsDiscardedOnSend;
+             unsigned long long            bytesDiscardedOnSend;
 };
 
 enum RTCStatsIceCandidatePairState {
@@ -363,85 +378,83 @@ dictionary RTCIceServerStats : RTCStats {
            double totalRoundTripTime;
 };
 
-dictionary RTCReceiverVideoTrackAttachmentStats : RTCVideoReceiverStats {
-};
+dictionary RTCReceiverVideoTrackAttachmentStats : RTCVideoReceiverStats {};
 
-dictionary RTCReceiverAudioTrackAttachmentStats : RTCAudioReceiverStats {
-};
+dictionary RTCReceiverAudioTrackAttachmentStats : RTCAudioReceiverStats {};
 
 partial dictionary RTCCodecStats {
-   DOMString implementation;
+    DOMString implementation;
 };
 
 partial dictionary RTCIceCandidateStats {
-   boolean deleted = false;
-   boolean isRemote;
+    boolean deleted = false;
+    boolean isRemote;
 };
 
 partial dictionary RTCIceCandidatePairStats {
-double totalRtt;
-double currentRtt;
-unsigned long long priority;
+    double totalRtt;
+    double currentRtt;
+    unsigned long long priority;
 };
 
 partial dictionary RTCRtpStreamStats {
-             DOMString mediaType;
-             double averageRTCPInterval;
+    DOMString mediaType;
+    double averageRTCPInterval;
 };
 
 partial dictionary RTCInboundRtpStreamStats {
-          double fractionLost;
+    double fractionLost;
 };
 
 partial dictionary RTCAudioHandlerStats {
-            double audioLevel;
-            double totalAudioEnergy;
-            double totalSamplesDuration;
-            boolean voiceActivityFlag;
+    double audioLevel;
+    double totalAudioEnergy;
+    double totalSamplesDuration;
+    boolean voiceActivityFlag;
 };
 
 partial dictionary RTCAudioSenderStats {
-            unsigned long long totalSamplesSent;
-            double echoReturnLoss;
-            double echoReturnLossEnhancement;
+    unsigned long long totalSamplesSent;
+    double echoReturnLoss;
+    double echoReturnLossEnhancement;
 };
 
 partial dictionary RTCAudioReceiverStats {
-            DOMHighResTimeStamp estimatedPlayoutTimestamp;
-            double jitterBufferDelay;
-            unsigned long long jitterBufferEmittedCount;
-            unsigned long long totalSamplesReceived;
-            unsigned long long concealedSamples;
-            unsigned long long silentConcealedSamples;
-            unsigned long long concealmentEvents;
-            unsigned long long insertedSamplesForDeceleration;
-            unsigned long long removedSamplesForAcceleration;
-            double audioLevel;
-            double totalAudioEnergy;
-            double totalSamplesDuration;
+    DOMHighResTimeStamp estimatedPlayoutTimestamp;
+    double jitterBufferDelay;
+    unsigned long long jitterBufferEmittedCount;
+    unsigned long long totalSamplesReceived;
+    unsigned long long concealedSamples;
+    unsigned long long silentConcealedSamples;
+    unsigned long long concealmentEvents;
+    unsigned long long insertedSamplesForDeceleration;
+    unsigned long long removedSamplesForAcceleration;
+    double audioLevel;
+    double totalAudioEnergy;
+    double totalSamplesDuration;
 };
 
 partial dictionary RTCVideoHandlerStats {
-          unsigned long frameWidth;
-          unsigned long frameHeight;
-          double framesPerSecond;
+    unsigned long frameWidth;
+    unsigned long frameHeight;
+    double framesPerSecond;
 };
 
 partial dictionary RTCVideoSenderStats {
-          unsigned long keyFramesSent;
-          unsigned long framesCaptured;
-          unsigned long framesSent;
-          unsigned long hugeFramesSent;
+    unsigned long keyFramesSent;
+    unsigned long framesCaptured;
+    unsigned long framesSent;
+    unsigned long hugeFramesSent;
 };
 
 partial dictionary RTCVideoReceiverStats {
-          unsigned long keyFramesReceived;
-          DOMHighResTimeStamp estimatedPlayoutTimestamp;
-          double jitterBufferDelay;
-          unsigned long long jitterBufferEmittedCount;
-          unsigned long framesReceived;
-          unsigned long framesDecoded;
-          unsigned long framesDropped;
-          unsigned long partialFramesLost;
-          unsigned long fullFramesLost;
+    unsigned long keyFramesReceived;
+    DOMHighResTimeStamp estimatedPlayoutTimestamp;
+    double jitterBufferDelay;
+    unsigned long long jitterBufferEmittedCount;
+    unsigned long framesReceived;
+    unsigned long framesDecoded;
+    unsigned long framesDropped;
+    unsigned long partialFramesLost;
+    unsigned long fullFramesLost;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/webrtc.idl b/tests/wpt/web-platform-tests/interfaces/webrtc.idl
index d828fae6b7c8..f24dabcf4f84 100644
--- a/tests/wpt/web-platform-tests/interfaces/webrtc.idl
+++ b/tests/wpt/web-platform-tests/interfaces/webrtc.idl
@@ -15,18 +15,11 @@ dictionary RTCConfiguration {
 
 enum RTCIceCredentialType {
   "password",
-  "oauth"
-};
-
-dictionary RTCOAuthCredential {
-  required DOMString macKey;
-  required DOMString accessToken;
 };
 
 dictionary RTCIceServer {
   required (DOMString or sequence<DOMString>) urls;
   DOMString username;
-  (DOMString or RTCOAuthCredential) credential;
   RTCIceCredentialType credentialType = "password";
 };
 
@@ -242,13 +235,6 @@ dictionary RTCPeerConnectionIceErrorEventInit : EventInit {
   USVString statusText;
 };
 
-enum RTCPriorityType {
-  "very-low",
-  "low",
-  "medium",
-  "high"
-};
-
 partial interface RTCPeerConnection {
   static Promise<RTCCertificate>
       generateCertificate(AlgorithmIdentifier keygenAlgorithm);
@@ -311,7 +297,6 @@ dictionary RTCRtpSendParameters : RTCRtpParameters {
   required DOMString transactionId;
   required sequence<RTCRtpEncodingParameters> encodings;
   RTCDegradationPreference degradationPreference = "balanced";
-  RTCPriorityType priority = "low";
 };
 
 dictionary RTCRtpReceiveParameters : RTCRtpParameters {
@@ -327,7 +312,6 @@ dictionary RTCRtpDecodingParameters : RTCRtpCodingParameters {};
 dictionary RTCRtpEncodingParameters : RTCRtpCodingParameters {
   boolean active = true;
   unsigned long maxBitrate;
-  double maxFramerate;
   double scaleResolutionDownBy;
 };
 
@@ -527,7 +511,6 @@ interface RTCDataChannel : EventTarget {
   readonly attribute USVString protocol;
   readonly attribute boolean negotiated;
   readonly attribute unsigned short? id;
-  readonly attribute RTCPriorityType priority;
   readonly attribute RTCDataChannelState readyState;
   readonly attribute unsigned long bufferedAmount;
   [EnforceRange] attribute unsigned long bufferedAmountLowThreshold;
@@ -552,7 +535,6 @@ dictionary RTCDataChannelInit {
   USVString protocol = "";
   boolean negotiated = false;
   [EnforceRange] unsigned short id;
-  RTCPriorityType priority = "low";
 };
 
 enum RTCDataChannelState {
diff --git a/tests/wpt/web-platform-tests/intersection-observer/v2/position-relative.html b/tests/wpt/web-platform-tests/intersection-observer/v2/position-relative.html
new file mode 100644
index 000000000000..4cdc42957003
--- /dev/null
+++ b/tests/wpt/web-platform-tests/intersection-observer/v2/position-relative.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta name="viewport" content="width=device-width,initial-scale=1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/intersection-observer-test-utils.js"></script>
+
+<style>
+body, html {
+  margin: 0;
+}
+pre, #log {
+  position: absolute;
+  top: 0;
+  left: 200px;
+}
+.relpos {
+  position: relative;
+}
+</style>
+
+<div id="target" class="relpos">
+  <div class="relpos">
+    <img border="0" width="100" height="100" src=""/>
+  </div>
+</div>
+
+<script>
+var delay = 100;
+var entries = [];
+var target;
+
+runTestCycle(function() {
+  target = document.getElementById("target");
+  assert_true(!!target, "target exists");
+  var observer = new IntersectionObserver(function(changes) {
+    entries = entries.concat(changes)
+  }, {trackVisibility: true, delay: delay});
+  observer.observe(target);
+  entries = entries.concat(observer.takeRecords());
+  assert_equals(entries.length, 0, "No initial notifications.");
+  runTestCycle(step0, "First rAF.", delay);
+}, "IntersectionObserverV2 observing a position:relative div containing a position:relative child");
+
+function step0() {
+  assert_equals(entries.length, 1, "First notification.");
+  assert_true(entries[0].isVisible, "Target is visible.");
+}
+</script>
+
diff --git a/tests/wpt/web-platform-tests/lint.whitelist b/tests/wpt/web-platform-tests/lint.whitelist
index 23cf36a89a5a..be6ae4f03149 100644
--- a/tests/wpt/web-platform-tests/lint.whitelist
+++ b/tests/wpt/web-platform-tests/lint.whitelist
@@ -304,6 +304,7 @@ SET TIMEOUT: resources/test/tests/functional/worker.js
 SET TIMEOUT: resources/test/tests/functional/worker-uncaught-allow.js
 SET TIMEOUT: resources/test/tests/unit/exceptional-cases.html
 SET TIMEOUT: resources/test/tests/unit/exceptional-cases-timeouts.html
+SET TIMEOUT: resources/test/tests/unit/promise_setup.html
 SET TIMEOUT: resources/testharness.js
 
 # setTimeout use in reftests
@@ -469,6 +470,7 @@ CSS-COLLIDING-SUPPORT-NAME: css/*/LOCK
 # These are all the current "merge mismatch" errors the build system produces
 CSS-COLLIDING-SUPPORT-NAME: css/css-flexbox/support/200x200-green.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-grid/grid-items/support/200x200-green.png
+CSS-COLLIDING-SUPPORT-NAME: css/css-scroll-snap/support/common.css
 CSS-COLLIDING-SUPPORT-NAME: css/css-regions/contentEditable/support/common.css
 CSS-COLLIDING-SUPPORT-NAME: css/css-regions/interactivity/full-screen/support/common.css
 CSS-COLLIDING-SUPPORT-NAME: css/css-backgrounds/support/pattern-grg-rgr-grg.png
@@ -674,7 +676,11 @@ MISSING-LINK: css/filter-effects/*.any.js
 LAYOUTTESTS APIS: css/css-regions/interactivity/*
 LAYOUTTESTS APIS: import-maps/resources/jest-test-helper.js
 LAYOUTTESTS APIS: resources/chromium/generic_sensor_mocks.js
+LAYOUTTESTS APIS: resources/chromium/nfc-mock.js
 LAYOUTTESTS APIS: resources/chromium/webxr-test.js
+LAYOUTTESTS APIS: web-nfc/NDEFReader-document-hidden-manual.https.html
+LAYOUTTESTS APIS: web-nfc/NDEFReader_scan.https.html
+LAYOUTTESTS APIS: web-nfc/NDEFWriter_push.https.html
 
 # Signed Exchange files have hard-coded URLs in the certUrl field
 WEB-PLATFORM.TEST:signed-exchange/resources/*.sxg
diff --git a/tests/wpt/web-platform-tests/media-capabilities/decodingInfo.any.js b/tests/wpt/web-platform-tests/media-capabilities/decodingInfo.any.js
index edd58ac3409b..67b90d9db652 100644
--- a/tests/wpt/web-platform-tests/media-capabilities/decodingInfo.any.js
+++ b/tests/wpt/web-platform-tests/media-capabilities/decodingInfo.any.js
@@ -1,3 +1,4 @@
+// META: timeout=long
 'use strict';
 
 // Minimal VideoConfiguration that will be allowed per spec. All optional
@@ -129,7 +130,7 @@ promise_test(t => {
 }, "Test that decodingInfo rejects if the video configuration contentType has one parameter that isn't codecs");
 
 promise_test(t => {
-  return navigator.mediaCapabilities.decodingInfo({
+  return promise_rejects(t, new TypeError(), navigator.mediaCapabilities.decodingInfo({
     type: 'file',
     video: {
       contentType: 'video/webm; codecs="vp09.00.10.08"',
@@ -138,8 +139,8 @@ promise_test(t => {
       bitrate: 3000,
       framerate: '24000/1001',
     }
-  });
-}, "Test that decodingInfo() accepts framerate in the form of x/y");
+  }));
+}, "Test that decodingInfo() rejects framerate in the form of x/y");
 
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
@@ -206,32 +207,6 @@ promise_test(t => {
   }));
 }, "Test that decodingInfo() rejects framerate in the form of x/");
 
-promise_test(t => {
-  return navigator.mediaCapabilities.decodingInfo({
-    type: 'file',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24000/1e4',
-    }
-  });
-}, "Test that decodingInfo() accepts framerate with 'e'");
-
-promise_test(t => {
-  return navigator.mediaCapabilities.decodingInfo({
-    type: 'file',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24/1.0001',
-    }
-  });
-}, "Test that decodingInfo() accepts framerate as fraction with decimals");
-
 promise_test(t => {
   return promise_rejects_js(t, TypeError, navigator.mediaCapabilities.decodingInfo({
     type: 'file',
diff --git a/tests/wpt/web-platform-tests/media-capabilities/decodingInfoEncryptedMedia.https.html b/tests/wpt/web-platform-tests/media-capabilities/decodingInfoEncryptedMedia.https.html
index ca94d0b6499e..9886c363fbf8 100644
--- a/tests/wpt/web-platform-tests/media-capabilities/decodingInfoEncryptedMedia.https.html
+++ b/tests/wpt/web-platform-tests/media-capabilities/decodingInfoEncryptedMedia.https.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <title>MediaCapabilities.decodingInfo() for encrypted media</title>
+<meta name="timeout" content="long">
 <script src=/resources/testharness.js></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
@@ -48,7 +49,9 @@
     video: minimalVideoConfiguration,
     keySystemConfiguration: {
       keySystem: 'org.w3.clearkey',
-      videoRobustness: '',
+      video: {
+        robustness: '',
+      },
     },
   });
 }, "Test that decodingInfo() accepts a key system configuration with video info.");
@@ -59,7 +62,9 @@
     audio: minimalAudioConfiguration,
     keySystemConfiguration: {
       keySystem: 'org.w3.clearkey',
-      audioRobustness: '',
+      audio : {
+        robustness: '',
+      },
     },
   });
 }, "Test that decodingInfo() accepts a key system configuration with audio info.");
@@ -70,7 +75,9 @@
     audio: minimalAudioConfiguration,
     keySystemConfiguration: {
       keySystem: 'org.w3.clearkey',
-      videoRobustness: '',
+      video: {
+        robustness: '',
+      },
     },
   }));
 }, "Test that decodingInfo() rejects if robustness and configuration do not match (1).");
@@ -81,7 +88,9 @@
     video: minimalVideoConfiguration,
     keySystemConfiguration: {
       keySystem: 'org.w3.clearkey',
-      audioRobustness: '',
+      audio : {
+        robustness: '',
+      },
     },
   }));
 }, "Test that decodingInfo() rejects if robustness and configuration do not match (2).");
@@ -92,8 +101,12 @@
     video: minimalVideoConfiguration,
     keySystemConfiguration: {
       keySystem: 'org.w3.clearkey',
-      audioRobustness: '',
-      videoRobustness: '',
+      audio : {
+        robustness: '',
+      },
+      video: {
+        robustness: '',
+      },
     },
   }));
 }, "Test that decodingInfo() rejects if robustness and configuration do not match (3).");
@@ -105,8 +118,12 @@
     video: minimalVideoConfiguration,
     keySystemConfiguration: {
       keySystem: 'org.w3.clearkey',
-      audioRobustness: '',
-      videoRobustness: '',
+      audio : {
+        robustness: '',
+      },
+      video: {
+        robustness: '',
+      },
       persistentState: "foobar",
     },
   }));
@@ -119,8 +136,12 @@
     video: minimalVideoConfiguration,
     keySystemConfiguration: {
       keySystem: 'org.w3.clearkey',
-      audioRobustness: '',
-      videoRobustness: '',
+      audio : {
+        robustness: '',
+      },
+      video: {
+        robustness: '',
+      },
       distinctiveIdentifier: "foobar",
     },
   }));
@@ -133,8 +154,12 @@
     video: minimalVideoConfiguration,
     keySystemConfiguration: {
       keySystem: 'org.w3.clearkey',
-      audioRobustness: '',
-      videoRobustness: '',
+      audio : {
+        robustness: '',
+      },
+      video: {
+        robustness: '',
+      },
       sessionTypes: "foobar",
     },
   }));
@@ -148,8 +173,12 @@
     keySystemConfiguration: {
       keySystem: {},
       initDataType: {},
-      audioRobustness: {},
-      videoRobustness: {},
+      audio : {
+        robustness: '',
+      },
+      video: {
+        robustness: '',
+      },
     },
   });
 }, "Test that decodingInfo() does not reject when properties are set to unexpected values.");
@@ -174,7 +203,9 @@
     video: minimalVideoConfiguration,
     keySystemConfiguration: {
       keySystem: 'foobar',
-      videoRobustness: '',
+      video: {
+        robustness: '',
+      },
     }
   }).then(ability => {
     assert_false(ability.supported);
diff --git a/tests/wpt/web-platform-tests/media-capabilities/encodingInfo.html b/tests/wpt/web-platform-tests/media-capabilities/encodingInfo.html
index 08a3f7569a18..4c0f3abd671e 100644
--- a/tests/wpt/web-platform-tests/media-capabilities/encodingInfo.html
+++ b/tests/wpt/web-platform-tests/media-capabilities/encodingInfo.html
@@ -133,7 +133,7 @@
 }, "Test that encodingInfo rejects if the video configuration contentType has one parameter that isn't codecs");
 
 promise_test(t => {
-  return navigator.mediaCapabilities.encodingInfo({
+  return promise_rejects(t, new TypeError(), navigator.mediaCapabilities.encodingInfo({
     type: 'record',
     video: {
       contentType: 'video/webm; codecs="vp09.00.10.08"',
@@ -142,8 +142,8 @@
       bitrate: 3000,
       framerate: '24000/1001',
     }
-  });
-}, "Test that encodingInfo() accepts framerate in the form of x/y");
+  }));
+}, "Test that encodingInfo() rejects framerate in the form of x/y");
 
 promise_test(t => {
   return promise_rejects(t, new TypeError(), navigator.mediaCapabilities.encodingInfo({
@@ -210,32 +210,6 @@
   }));
 }, "Test that encodingInfo() rejects framerate in the form of x/");
 
-promise_test(t => {
-  return navigator.mediaCapabilities.encodingInfo({
-    type: 'record',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24000/1e4',
-    }
-  });
-}, "Test that encodingInfo() accepts framerate with 'e'");
-
-promise_test(t => {
-  return navigator.mediaCapabilities.encodingInfo({
-    type: 'record',
-    video: {
-      contentType: 'video/webm; codecs="vp09.00.10.08"',
-      width: 800,
-      height: 600,
-      bitrate: 3000,
-      framerate: '24/1.0001',
-    }
-  });
-}, "Test that encodingInfo() accepts framerate as fraction with decimals");
-
 promise_test(t => {
   return promise_rejects(t, new TypeError(), navigator.mediaCapabilities.encodingInfo({
     type: 'record',
diff --git a/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_touch-action-verification.html b/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_touch-action-verification.html
new file mode 100644
index 000000000000..311d24b628e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/compat/pointerevent_touch-action-verification.html
@@ -0,0 +1,45 @@
+<!doctype html>
+<html>
+    <head>
+<!-- This file tests the additional touch-action values that are not in the main spec
+     but are mostly implemented by browsers. It should be integrated into main test
+     suite when they are accepted into the specification. -->
+        <title>touch-action: basic verification</title>
+        <meta name="assert" content="The touch-action CSS property determines whether touch input MAY trigger default behavior supplied by the user agent.
+        pinch-zoom: The user agent MAY consider touches that begin on the element only for the purposes of zooming in and out.
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body onload="run()">
+        <h2>Pointer Events touch-action attribute support</h2>
+        <h4 id="desc">Test Description: Test will automatically check parsing behaviour of various touch-action combinations.</h4>
+        <script type='text/javascript'>
+            var detected_pointertypes = {};
+
+            setup({ explicit_done: true });
+
+            function run() {
+                var tests = document.querySelectorAll('.test');
+                //TA 15.20
+                for (var i = 0; i < tests.length; i++) {
+                    test(function() {
+                      var style = window.getComputedStyle(tests[i]);
+                      assert_equals(tests[i].attributes.expected.value, style.touchAction);
+                    }, tests[i].id);
+                }
+                done();
+            }
+        </script>
+        <h1>touch-action: basic verification</h1>
+        <div id="complete-notice">
+            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+        </div>
+        <div id="log"></div>
+        <div class="test" id="explicit-pinch-zoom" style="touch-action: pinch-zoom;" expected="pinch-zoom"></div>
+        <div class="test" id="explicit-pinch-zoom-pan-x-pan-up" style="touch-action: pinch-zoom pan-x pan-up;" expected="pan-x pan-up pinch-zoom"></div>
+        <div class="test" id="explicit-pinch-zoom-pan-x-pan-y" style="touch-action: pinch-zoom pan-x pan-y;" expected="manipulation"></div>
+        <div class="test" id="explicit-invalid-14" style="touch-action: pinch-zoom none;" expected="auto"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/idlharness.window.js b/tests/wpt/web-platform-tests/pointerevents/extension/idlharness.window.js
deleted file mode 100644
index 895a89109c6d..000000000000
--- a/tests/wpt/web-platform-tests/pointerevents/extension/idlharness.window.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// META: script=/resources/WebIDLParser.js
-// META: script=/resources/idlharness.js
-
-// https://w3c.github.io/pointerevents/extension.html
-
-idl_test(
-  ['pointerevents-extension'],
-  ['pointerevents', 'uievents', 'dom'],
-  idl_array => {
-    idl_array.add_objects({
-      PointerEvent: ['new PointerEvent("pointer")'],
-    })
-  }
-);
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_constructor.html b/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_constructor.html
deleted file mode 100644
index 60b579050a18..000000000000
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_constructor.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <title>PointerEvent: Constructor test</title>
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <!-- Additional helper script for common checks across event types -->
-    </head>
-    <body>
-    <h1>PointerEvent: Dispatch custom event with coalesced events</h1>
-    <h4>Test Description: This test checks if PointerEvent constructor works properly with respect to the coalesced events.</h4>
-    <div id="target0"></div>
-    <script>
-        async_test(function() {
-            var target0 = document.getElementById("target0");
-            // set values for non-default constructor
-            on_event(target0, "pointermove", this.step_func(function(event) {
-                generate_tests(assert_equals, [
-                    ["getCoalescedEvents().length", event.getCoalescedEvents().length, 2],
-                    ["getPredictedEvents().length", event.getPredictedEvents().length, 2],
-                    ["event.target", event.target, target0],
-                    ["event.currentTarget", event.currentTarget, target0],
-                    ["event.eventPhase", event.eventPhase, Event.AT_TARGET],
-                    ["event.clientX", event.clientX, 310],
-                    ["getCoalescedEvents()[0].clientX", event.getCoalescedEvents()[0].clientX, 300],
-                    ["getCoalescedEvents()[1].clientX", event.getCoalescedEvents()[1].clientX, 310],
-                    ["getPredictedEvents()[0].clientX", event.getPredictedEvents()[0].clientX, 320],
-                    ["getPredictedEvents()[1].clientX", event.getPredictedEvents()[1].clientX, 330],
-                ]);
-                for (var i=0; i<event.getCoalescedEvents().length; i++) {
-                    var coalescedEvent = event.getCoalescedEvents()[i];
-                    generate_tests(assert_equals, [
-                        ["getCoalescedEvents()[" + i + "].pointerId", coalescedEvent.pointerId, event.pointerId],
-                        ["getCoalescedEvents()[" + i + "].pointerType", coalescedEvent.pointerType, event.pointerType],
-                        ["getCoalescedEvents()[" + i + "].isPrimary", coalescedEvent.isPrimary, event.isPrimary],
-                        ["getCoalescedEvents()[" + i + "].getCoalescedEvents().length", coalescedEvent.getCoalescedEvents().length, 0],
-                        ["getCoalescedEvents()[" + i + "].getPredictedEvents().length", coalescedEvent.getPredictedEvents().length, 0],
-                        ["getCoalescedEvents()[" + i + "].target", coalescedEvent.target, target0],
-                        ["getCoalescedEvents()[" + i + "].currentTarget", coalescedEvent.currentTarget, null],
-                        ["getCoalescedEvents()[" + i + "].eventPhase", coalescedEvent.eventPhase, Event.NONE],
-                        ["getCoalescedEvents()[" + i + "].cancelable", coalescedEvent.cancelable, false],
-                        ["getCoalescedEvents()[" + i + "].bubbles", coalescedEvent.bubbles, false],
-                        ["getCoalescedEvents()[" + i + "].offsetX", coalescedEvent.offsetX, event.offsetX + (i==0?-10:0)],
-                        ["getCoalescedEvents()[" + i + "].offsetY", coalescedEvent.offsetY, event.offsetY],
-                    ]);
-                }
-                for (var i=0; i<event.getPredictedEvents().length; i++) {
-                    var predictedEvent = event.getPredictedEvents()[i];
-                    generate_tests(assert_equals, [
-                        ["getPredictedEvents()[" + i + "].pointerId", predictedEvent.pointerId, event.pointerId],
-                        ["getPredictedEvents()[" + i + "].pointerType", predictedEvent.pointerType, event.pointerType],
-                        ["getPredictedEvents()[" + i + "].isPrimary", predictedEvent.isPrimary, event.isPrimary],
-                        ["getPredictedEvents()[" + i + "].getCoalescedEvents().length", predictedEvent.getCoalescedEvents().length, 0],
-                        ["getPredictedEvents()[" + i + "].getPredictedEvents().length", predictedEvent.getPredictedEvents().length, 0],
-                        ["getPredictedEvents()[" + i + "].target", predictedEvent.target, target0],
-                        ["getPredictedEvents()[" + i + "].currentTarget", predictedEvent.currentTarget, null],
-                        ["getPredictedEvents()[" + i + "].eventPhase", predictedEvent.eventPhase, Event.NONE],
-                        ["getPredictedEvents()[" + i + "].cancelable", predictedEvent.cancelable, false],
-                        ["getPredictedEvents()[" + i + "].bubbles", predictedEvent.bubbles, false],
-                        ["getPredictedEvents()[" + i + "].offsetX", predictedEvent.offsetX, event.offsetX + (i==0?10:20)],
-                        ["getPredictedEvents()[" + i + "].offsetY", predictedEvent.offsetY, event.offsetY],
-                    ]);
-                }
-            }));
-            on_event(target0, "pointerout", this.step_func(function(event) {
-                generate_tests(assert_equals, [
-                    ["default getCoalescedEvents().length", event.getCoalescedEvents().length, 0],
-                    ["default getPredictedEvents().length", event.getPredictedEvents().length, 0],
-                ]);
-            }));
-
-            on_event(window, "load", this.step_func_done(function() {
-                assert_not_equals(window.PointerEvent, undefined);
-
-                var pointerEventInitDict =
-                {
-                  pointerId: 42,
-                  pointerType: "pen",
-                  isPrimary: true,
-                  clientX: 300,
-                };
-
-                var p1 = new PointerEvent("pointermove", pointerEventInitDict);
-                pointerEventInitDict.clientX += 10;
-                var p2 = new PointerEvent("pointermove", pointerEventInitDict);
-                pointerEventInitDict.clientX += 10;
-                var p3 = new PointerEvent("pointermove", pointerEventInitDict);
-                pointerEventInitDict.clientX += 10;
-                var p4 = new PointerEvent("pointermove", pointerEventInitDict);
-                pointerEventInitDict.coalescedEvents = [p1, p2];
-                pointerEventInitDict.predictedEvents = [p3, p4];
-                pointerEventInitDict.clientX = 310;
-                var event = new PointerEvent("pointermove", pointerEventInitDict);
-                target0.dispatchEvent(event);
-
-                var pointerEventDefault = new PointerEvent("pointerout");
-                target0.dispatchEvent(pointerEventDefault);
-            }, "PointerEvent constructor"));
-        })
-    </script>
-    <div id="complete-notice">
-    <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-    </div>
-    <div id="log"></div>
-    </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-verification.html b/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-verification.html
deleted file mode 100644
index 178f7a68a58e..000000000000
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-verification.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-<!-- This is a fork of the main to support new additions to touch-action.
-     It should be integrated into web-platform-test when they are accepted into the
-     specification. -->
-        <title>touch-action: basic verification</title>
-        <meta name="assert" content="TA15.20 - The touch-action CSS property determines whether touch input MAY trigger default behavior supplied by the user agent.
-        auto: The user agent MAY determine any permitted touch behaviors, such as panning and zooming manipulations of the viewport, for touches that begin on the element.
-        none: Touches that begin on the element MUST NOT trigger default touch behaviors.
-        pan-x: The user agent MAY consider touches that begin on the element only for the purposes of horizontally scrolling the element's nearest ancestor with horizontally scrollable content.
-        pan-y: The user agent MAY consider touches that begin on the element only for the purposes of vertically scrolling the element's nearest ancestor with vertically scrollable content.
-        manipulation: The user agent MAY consider touches that begin on the element only for the purposes of scrolling and continuous zooming. Any additional behaviors supported by auto are out of scope for this specification.">
-        <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
-        <script src="/resources/testharness.js"></script>
-        <script src="/resources/testharnessreport.js"></script>
-        <style>
-          /*
-          Give some rules below something to override in order to test
-          that they really are being parsed
-          */
-          .defnone {
-          touch-action: none;
-          }
-        </style>
-    </head>
-    <body onload="run()">
-        <h2>Pointer Events touch-action attribute support</h2>
-        <h4 id="desc">Test Description: Test will automatically check parsing behaviour of various touch-action combinations.</h4>
-        <script type='text/javascript'>
-            var detected_pointertypes = {};
-
-            setup({ explicit_done: true });
-
-            function run() {
-                var tests = document.querySelectorAll('.test');
-                //TA 15.20
-                for (var i = 0; i < tests.length; i++) {
-                    test(function() {
-                      var style = window.getComputedStyle(tests[i]);
-                      assert_equals(tests[i].attributes.expected.value, style.touchAction);
-                    }, tests[i].id);
-                }
-                done();
-            }
-        </script>
-        <h1>touch-action: basic verification</h1>
-        <div id="complete-notice">
-            <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
-        </div>
-        <div id="log"></div>
-        <div class="test" id="default" expected="auto"></div>
-        <div class="test defnone" id="stylesheet-none" expected="none"></div>
-        <div class="test defnone" id="explicit-auto" style="touch-action: auto;" expected="auto"></div>
-        <div class="test" id="explicit-pan-x" style="touch-action: pan-x;" expected="pan-x"></div>
-        <div class="test" id="explicit-pan-left" style="touch-action: pan-left;" expected="pan-left"></div>
-        <div class="test" id="explicit-pan-right" style="touch-action: pan-right;" expected="pan-right"></div>
-        <div class="test" id="explicit-pan-y" style="touch-action: pan-y;" expected="pan-y"></div>
-        <div class="test" id="explicit-pan-up" style="touch-action: pan-up;" expected="pan-up"></div>
-        <div class="test" id="explicit-pan-down" style="touch-action: pan-down;" expected="pan-down"></div>
-        <div class="test" id="explicit-pinch-zoom" style="touch-action: pinch-zoom;" expected="pinch-zoom"></div>
-        <div class="test" id="explicit-pan-x-pan-y" style="touch-action: pan-x pan-y;" expected="pan-x pan-y"></div>
-        <div class="test" id="explicit-pan-y-pan-x" style="touch-action: pan-y pan-x;" expected="pan-x pan-y"></div>
-        <div class="test" id="explicit-pan-left-pan-up" style="touch-action: pan-left pan-up;" expected="pan-left pan-up"></div>
-        <div class="test" id="explicit-pan-left-pan-down" style="touch-action: pan-left pan-down;" expected="pan-left pan-down"></div>
-        <div class="test" id="explicit-pan-right-pan-up" style="touch-action: pan-right pan-up;" expected="pan-right pan-up"></div>
-        <div class="test" id="explicit-pan-right-pan-down" style="touch-action: pan-right pan-down;" expected="pan-right pan-down"></div>
-        <div class="test" id="explicit-pan-up-pan-left" style="touch-action: pan-up pan-left;" expected="pan-left pan-up"></div>
-        <div class="test" id="explicit-pan-up-pan-right" style="touch-action: pan-up pan-right;" expected="pan-right pan-up"></div>
-        <div class="test" id="explicit-pan-down-pan-left" style="touch-action: pan-down pan-left;" expected="pan-left pan-down"></div>
-        <div class="test" id="explicit-pan-down-pan-right" style="touch-action: pan-down pan-right;" expected="pan-right pan-down"></div>
-        <div class="test" id="explicit-pinch-zoom-pan-x-pan-up" style="touch-action: pinch-zoom pan-x pan-up;" expected="pan-x pan-up pinch-zoom"></div>
-        <div class="test" id="explicit-pinch-zoom-pan-x-pan-y" style="touch-action: pinch-zoom pan-x pan-y;" expected="manipulation"></div>
-        <div class="test" id="explicit-manipulation" style="touch-action: manipulation;" expected="manipulation"></div>
-        <div class="test" id="explicit-none" style="touch-action: none;" expected="none"></div>
-        <div class="test" id="explicit-invalid-1" style="touch-action: bogus;" expected="auto"></div>
-        <div class="test defnone" id="explicit-invalid-2" style="touch-action: auto pan-x;" expected="none"></div>
-        <div class="test" id="explicit-invalid-3" style="touch-action: pan-y none;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-4" style="touch-action: pan-x pan-x;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-5" style="touch-action: manipulation pan-x;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-6" style="touch-action: pan-x pan-left;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-7" style="touch-action: auto pan-left;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-8" style="touch-action: none pan-left;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-9" style="touch-action: pan-x pan-right;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-10" style="touch-action: pan-y pan-up;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-11" style="touch-action: pan-y pan-down;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-12" style="touch-action: pan-left pan-right;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-13" style="touch-action: pan-up pan-down;" expected="auto"></div>
-        <div class="test" id="explicit-invalid-14" style="touch-action: pinch-zoom none;" expected="auto"></div>
-        <div style="touch-action: none;">
-          <div class="test" id="not-inherited" expected="auto"></div>
-          <div class="test" id="inherit" style="touch-action: inherit;" expected="none"></div>
-        </div>
-        <div class="test defnone" id="initial" style="touch-action: initial;" expected="auto"></div>
-    </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_coalesced_events_attributes.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_coalesced_events_attributes.html
similarity index 98%
rename from tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_coalesced_events_attributes.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerevent_coalesced_events_attributes.html
index fa68124c829f..d30f71e940a5 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_coalesced_events_attributes.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_coalesced_events_attributes.html
@@ -1,16 +1,16 @@
 <!doctype html>
 <html>
     <head>
-        <title>Pointer Events coalesced events count and properties<</title>
+        <title>Pointer Events coalesced events count and properties</title>
         <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <script src="/resources/testdriver.js"></script>
         <script src="/resources/testdriver-actions.js"></script>
         <script src="/resources/testdriver-vendor.js"></script>
         <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="../pointerevent_support.js"></script>
+        <script type="text/javascript" src="pointerevent_support.js"></script>
         <script>
             var eventList = All_Pointer_Events;
             PhaseEnum = {
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_constructor.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_constructor.html
index b8a97d1a6bb7..0eb1ee5214e9 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_constructor.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_constructor.html
@@ -7,100 +7,94 @@
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="pointerevent_support.js"></script>
     </head>
     <body>
     <h1>PointerEvent: Dispatch custom event</h1>
-    <h4>Test Description: This test checks if PointerEvent constructor works properly using synthetic pointerover and pointerout events. For valid results, this test must be run without generating real (trusted) pointerover or pointerout events on the black rectangle below.</h4>
+    <h4>Test Description: This test checks if PointerEvent constructor works properly.</h4>
     <div id="target0"></div>
     <script>
-        var detected_pointertypes = {};
-        add_completion_callback(showPointerTypes);
-
         async_test(function() {
             var target0 = document.getElementById("target0");
             // set values for non-default constructor
-            var testBubbles = true;
-            var testCancelable = true;
-            var testPointerId = 42;
-            var testPointerType = 'pen';
-            var testClientX = 300;
-            var testClientY = 500;
-            var testWidth = 3;
-            var testHeight = 5;
-            var testTiltX = -45;
-            var testTiltY = 30;
-            var testButton = 0;
-            var testButtons = 1;
-            var testPressure = 0.4;
-            var testTangentialPressure = 0.5;
-            var testTwist = 286;
-            var testIsPrimary = true;
-
-            on_event(target0, "pointerover", this.step_func(function(event) {
-                detected_pointertypes[ event.pointerType ] = true;
+            on_event(target0, "pointermove", this.step_func(function(event) {
                 generate_tests(assert_equals, [
-                    ["custom bubbles", event.bubbles, testBubbles],
-                    ["custom cancelable", event.cancelable, testCancelable],
-                    ["custom pointerId", event.pointerId, testPointerId],
-                    ["custom pointerType", event.pointerType, testPointerType],
-                    ["custom button", event.button, testButton],
-                    ["custom buttons", event.buttons, testButtons],
-                    ["custom width", event.width, testWidth],
-                    ["custom height", event.height, testHeight],
-                    ["custom clientX", event.clientX, testClientX],
-                    ["custom clientY", event.clientY, testClientY],
-                    ["custom tiltX", event.tiltX, testTiltX],
-                    ["custom tiltY", event.tiltY, testTiltY],
-                    ["custom twist", event.twist, testTwist],
-                    ["custom isPrimary", event.isPrimary, testIsPrimary]
+                    ["getCoalescedEvents().length", event.getCoalescedEvents().length, 2],
+                    ["getPredictedEvents().length", event.getPredictedEvents().length, 2],
+                    ["event.target", event.target, target0],
+                    ["event.currentTarget", event.currentTarget, target0],
+                    ["event.eventPhase", event.eventPhase, Event.AT_TARGET],
+                    ["event.clientX", event.clientX, 310],
+                    ["getCoalescedEvents()[0].clientX", event.getCoalescedEvents()[0].clientX, 300],
+                    ["getCoalescedEvents()[1].clientX", event.getCoalescedEvents()[1].clientX, 310],
+                    ["getPredictedEvents()[0].clientX", event.getPredictedEvents()[0].clientX, 320],
+                    ["getPredictedEvents()[1].clientX", event.getPredictedEvents()[1].clientX, 330],
                 ]);
-                test(function() {
-                    assert_approx_equals(event.pressure, testPressure, 0.00000001, "custom pressure: ");
-                    assert_approx_equals(event.tangentialPressure, testTangentialPressure, 0.00000001, "custom tangential pressure: ");
-                }, "custom pressure: ");
+                for (var i=0; i<event.getCoalescedEvents().length; i++) {
+                    var coalescedEvent = event.getCoalescedEvents()[i];
+                    generate_tests(assert_equals, [
+                        ["getCoalescedEvents()[" + i + "].pointerId", coalescedEvent.pointerId, event.pointerId],
+                        ["getCoalescedEvents()[" + i + "].pointerType", coalescedEvent.pointerType, event.pointerType],
+                        ["getCoalescedEvents()[" + i + "].isPrimary", coalescedEvent.isPrimary, event.isPrimary],
+                        ["getCoalescedEvents()[" + i + "].getCoalescedEvents().length", coalescedEvent.getCoalescedEvents().length, 0],
+                        ["getCoalescedEvents()[" + i + "].getPredictedEvents().length", coalescedEvent.getPredictedEvents().length, 0],
+                        ["getCoalescedEvents()[" + i + "].target", coalescedEvent.target, target0],
+                        ["getCoalescedEvents()[" + i + "].currentTarget", coalescedEvent.currentTarget, null],
+                        ["getCoalescedEvents()[" + i + "].eventPhase", coalescedEvent.eventPhase, Event.NONE],
+                        ["getCoalescedEvents()[" + i + "].cancelable", coalescedEvent.cancelable, false],
+                        ["getCoalescedEvents()[" + i + "].bubbles", coalescedEvent.bubbles, false],
+                        ["getCoalescedEvents()[" + i + "].offsetX", coalescedEvent.offsetX, event.offsetX + (i==0?-10:0)],
+                        ["getCoalescedEvents()[" + i + "].offsetY", coalescedEvent.offsetY, event.offsetY],
+                    ]);
+                }
+                for (var i=0; i<event.getPredictedEvents().length; i++) {
+                    var predictedEvent = event.getPredictedEvents()[i];
+                    generate_tests(assert_equals, [
+                        ["getPredictedEvents()[" + i + "].pointerId", predictedEvent.pointerId, event.pointerId],
+                        ["getPredictedEvents()[" + i + "].pointerType", predictedEvent.pointerType, event.pointerType],
+                        ["getPredictedEvents()[" + i + "].isPrimary", predictedEvent.isPrimary, event.isPrimary],
+                        ["getPredictedEvents()[" + i + "].getCoalescedEvents().length", predictedEvent.getCoalescedEvents().length, 0],
+                        ["getPredictedEvents()[" + i + "].getPredictedEvents().length", predictedEvent.getPredictedEvents().length, 0],
+                        ["getPredictedEvents()[" + i + "].target", predictedEvent.target, target0],
+                        ["getPredictedEvents()[" + i + "].currentTarget", predictedEvent.currentTarget, null],
+                        ["getPredictedEvents()[" + i + "].eventPhase", predictedEvent.eventPhase, Event.NONE],
+                        ["getPredictedEvents()[" + i + "].cancelable", predictedEvent.cancelable, false],
+                        ["getPredictedEvents()[" + i + "].bubbles", predictedEvent.bubbles, false],
+                        ["getPredictedEvents()[" + i + "].offsetX", predictedEvent.offsetX, event.offsetX + (i==0?10:20)],
+                        ["getPredictedEvents()[" + i + "].offsetY", predictedEvent.offsetY, event.offsetY],
+                    ]);
+                }
             }));
-
             on_event(target0, "pointerout", this.step_func(function(event) {
                 generate_tests(assert_equals, [
-                    ["default pointerId", event.pointerId, 0],
-                    ["default pointerType", event.pointerType, ""],
-                    ["default width", event.width, 1],
-                    ["default height", event.height, 1],
-                    ["default tiltX", event.tiltX, 0],
-                    ["default tiltY", event.tiltY, 0],
-                    ["default pressure", event.pressure, 0],
-                    ["default tangentialPressure", event.tangentialPressure, 0],
-                    ["default twist", event.twist, 0],
-                    ["default isPrimary", event.isPrimary, false]
+                    ["default getCoalescedEvents().length", event.getCoalescedEvents().length, 0],
+                    ["default getPredictedEvents().length", event.getPredictedEvents().length, 0],
                 ]);
             }));
 
             on_event(window, "load", this.step_func_done(function() {
                 assert_not_equals(window.PointerEvent, undefined);
 
-                var pointerEventCustom = new PointerEvent("pointerover",
-                {bubbles: testBubbles,
-                cancelable: testCancelable,
-                pointerId: testPointerId,
-                pointerType: testPointerType,
-                width: testWidth,
-                height: testHeight,
-                clientX: testClientX,
-                clientY: testClientY,
-                tiltX: testTiltX,
-                tiltY: testTiltY,
-                button: testButton,
-                buttons: testButtons,
-                pressure: testPressure,
-                tangentialPressure: testTangentialPressure,
-                twist: testTwist,
-                isPrimary: testIsPrimary
-                });
-                // A PointerEvent created with a PointerEvent constructor must have all its attributes set to the corresponding values provided to the constructor.
-                // For attributes where values are not provided to the constructor, the corresponding default values must be used.
-                // TA: 12.1
-                target0.dispatchEvent(pointerEventCustom);
+                var pointerEventInitDict =
+                {
+                  pointerId: 42,
+                  pointerType: "pen",
+                  isPrimary: true,
+                  clientX: 300,
+                };
+
+                var p1 = new PointerEvent("pointermove", pointerEventInitDict);
+                pointerEventInitDict.clientX += 10;
+                var p2 = new PointerEvent("pointermove", pointerEventInitDict);
+                pointerEventInitDict.clientX += 10;
+                var p3 = new PointerEvent("pointermove", pointerEventInitDict);
+                pointerEventInitDict.clientX += 10;
+                var p4 = new PointerEvent("pointermove", pointerEventInitDict);
+                pointerEventInitDict.coalescedEvents = [p1, p2];
+                pointerEventInitDict.predictedEvents = [p3, p4];
+                pointerEventInitDict.clientX = 310;
+                var event = new PointerEvent("pointermove", pointerEventInitDict);
+                target0.dispatchEvent(event);
+
                 var pointerEventDefault = new PointerEvent("pointerout");
                 target0.dispatchEvent(pointerEventDefault);
             }, "PointerEvent constructor"));
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_pointerrawupdate.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerrawupdate.html
similarity index 95%
rename from tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_pointerrawupdate.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerrawupdate.html
index 0f46583c9b5d..74c14d932ff5 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_pointerrawupdate.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointerrawupdate.html
@@ -3,14 +3,14 @@
     <head>
         <title>pointerrawupdate</title>
         <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <script src="/resources/testdriver.js"></script>
         <script src="/resources/testdriver-actions.js"></script>
         <script src="/resources/testdriver-vendor.js"></script>
         <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="../pointerevent_support.js"></script>
+        <script type="text/javascript" src="pointerevent_support.js"></script>
     </head>
     <body onload="run()">
         <h2>pointerrawupdate</h2>
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_predicted_events_attributes-manual.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_predicted_events_attributes-manual.html
similarity index 97%
rename from tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_predicted_events_attributes-manual.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerevent_predicted_events_attributes-manual.html
index fdfcae1fc8ef..1276d3657f8f 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_predicted_events_attributes-manual.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_predicted_events_attributes-manual.html
@@ -3,11 +3,11 @@
     <head>
         <title>Pointer Events predicted events count and properties<</title>
         <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="../pointerevent_support.js"></script>
+        <script type="text/javascript" src="pointerevent_support.js"></script>
         <script>
             var eventList = All_Pointer_Events;
             PhaseEnum = {
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-down-css_touch.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-down-css_touch.html
similarity index 97%
rename from tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-down-css_touch.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-down-css_touch.html
index 7b713f9e5c44..804a5144f118 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-down-css_touch.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-down-css_touch.html
@@ -4,13 +4,13 @@
         <title>touch-action: pan-down</title>
         <meta name="assert" content="TA15.4 - With `touch-action: pan-down` on a swiped or click/dragged element, only panning in the y-axis down direction should be possible.">
         <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <script src="/resources/testdriver.js"></script>
         <script src="/resources/testdriver-actions.js"></script>
         <script src="/resources/testdriver-vendor.js"></script>
-        <script src="../pointerevent_support.js"></script>
+        <script src="pointerevent_support.js"></script>
         <style>
             #target0 {
             width: 700px;
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-left-css_touch.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-left-css_touch.html
similarity index 97%
rename from tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-left-css_touch.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-left-css_touch.html
index f1becf3e7dba..99c7ad81328c 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-left-css_touch.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-left-css_touch.html
@@ -4,13 +4,13 @@
         <title>touch-action: pan-left</title>
         <meta name="assert" content="TA15.3 - With `touch-action: pan-left` on a swiped or click/dragged element, only panning on the x-axis left direction should be possible.">
         <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <script src="/resources/testdriver.js"></script>
         <script src="/resources/testdriver-actions.js"></script>
         <script src="/resources/testdriver-vendor.js"></script>
-        <script src="../pointerevent_support.js"></script>
+        <script src="pointerevent_support.js"></script>
         <style>
             #target0 {
             width: 700px;
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-right-css_touch.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html
similarity index 97%
rename from tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-right-css_touch.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html
index 2c93b5505aea..c211e17b17c8 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-right-css_touch.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-right-css_touch.html
@@ -4,13 +4,13 @@
         <title>touch-action: pan-right</title>
         <meta name="assert" content="TA15.3 - With `touch-action: pan-right` on a swiped or click/dragged element, only panning on the x-axis right direction should be possible.">
         <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <script src="/resources/testdriver.js"></script>
         <script src="/resources/testdriver-actions.js"></script>
         <script src="/resources/testdriver-vendor.js"></script>
-        <script src="../pointerevent_support.js"></script>
+        <script src="pointerevent_support.js"></script>
         <style>
             #target0 {
             width: 700px;
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-up-css_touch.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-up-css_touch.html
similarity index 97%
rename from tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-up-css_touch.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-up-css_touch.html
index 30fb3bdfd03c..565d0d1d3e4a 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_touch-action-pan-up-css_touch.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-pan-up-css_touch.html
@@ -4,13 +4,13 @@
         <title>touch-action: pan-up</title>
         <meta name="assert" content="TA15.4 - With `touch-action: pan-up` on a swiped or click/dragged element, only panning in the y-axis up direction should be possible.">
         <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <script src="/resources/testdriver.js"></script>
         <script src="/resources/testdriver-actions.js"></script>
         <script src="/resources/testdriver-vendor.js"></script>
-        <script src="../pointerevent_support.js"></script>
+        <script src="pointerevent_support.js"></script>
         <style>
             #target0 {
             width: 700px;
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-verification.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-verification.html
index 80d61e0a6697..6a47eaee278c 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-verification.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_touch-action-verification.html
@@ -51,9 +51,21 @@ <h1>touch-action: basic verification</h1>
         <div class="test defnone" id="stylesheet-none" expected="none"></div>
         <div class="test defnone" id="explicit-auto" style="touch-action: auto;" expected="auto"></div>
         <div class="test" id="explicit-pan-x" style="touch-action: pan-x;" expected="pan-x"></div>
+        <div class="test" id="explicit-pan-left" style="touch-action: pan-left;" expected="pan-left"></div>
+        <div class="test" id="explicit-pan-right" style="touch-action: pan-right;" expected="pan-right"></div>
         <div class="test" id="explicit-pan-y" style="touch-action: pan-y;" expected="pan-y"></div>
+        <div class="test" id="explicit-pan-up" style="touch-action: pan-up;" expected="pan-up"></div>
+        <div class="test" id="explicit-pan-down" style="touch-action: pan-down;" expected="pan-down"></div>
         <div class="test" id="explicit-pan-x-pan-y" style="touch-action: pan-x pan-y;" expected="pan-x pan-y"></div>
         <div class="test" id="explicit-pan-y-pan-x" style="touch-action: pan-y pan-x;" expected="pan-x pan-y"></div>
+        <div class="test" id="explicit-pan-left-pan-up" style="touch-action: pan-left pan-up;" expected="pan-left pan-up"></div>
+        <div class="test" id="explicit-pan-left-pan-down" style="touch-action: pan-left pan-down;" expected="pan-left pan-down"></div>
+        <div class="test" id="explicit-pan-right-pan-up" style="touch-action: pan-right pan-up;" expected="pan-right pan-up"></div>
+        <div class="test" id="explicit-pan-right-pan-down" style="touch-action: pan-right pan-down;" expected="pan-right pan-down"></div>
+        <div class="test" id="explicit-pan-up-pan-left" style="touch-action: pan-up pan-left;" expected="pan-left pan-up"></div>
+        <div class="test" id="explicit-pan-up-pan-right" style="touch-action: pan-up pan-right;" expected="pan-right pan-up"></div>
+        <div class="test" id="explicit-pan-down-pan-left" style="touch-action: pan-down pan-left;" expected="pan-left pan-down"></div>
+        <div class="test" id="explicit-pan-down-pan-right" style="touch-action: pan-down pan-right;" expected="pan-right pan-down"></div>
         <div class="test" id="explicit-manipulation" style="touch-action: manipulation;" expected="manipulation"></div>
         <div class="test" id="explicit-none" style="touch-action: none;" expected="none"></div>
         <div class="test" id="explicit-invalid-1" style="touch-action: bogus;" expected="auto"></div>
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_getCoalescedEvents_when_pointerlocked.html b/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html
similarity index 99%
rename from tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_getCoalescedEvents_when_pointerlocked.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html
index b8443767524b..1aa381b466e7 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_getCoalescedEvents_when_pointerlocked.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_getCoalescedEvents_when_pointerlocked.html
@@ -71,4 +71,4 @@ <h4>
         </div>
         <div class="spacer"></div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_getPredictedEvents_when_pointerlocked-manual.html b/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_getPredictedEvents_when_pointerlocked-manual.html
similarity index 95%
rename from tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_getPredictedEvents_when_pointerlocked-manual.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_getPredictedEvents_when_pointerlocked-manual.html
index eaf08d675a40..aba08f14b80b 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_getPredictedEvents_when_pointerlocked-manual.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_getPredictedEvents_when_pointerlocked-manual.html
@@ -3,10 +3,10 @@
     <head>
         <title>Pointer Events pointer lock tests</title>
         <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
-        <script type="text/javascript" src="../pointerevent_support.js"></script>
+        <script type="text/javascript" src="pointerevent_support.js"></script>
         <style>
           #testContainer {
             touch-action: none;
diff --git a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_pointerrawupdate_in_pointerlock-manual.html b/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointerrawupdate_in_pointerlock-manual.html
similarity index 96%
rename from tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_pointerrawupdate_in_pointerlock-manual.html
rename to tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointerrawupdate_in_pointerlock-manual.html
index 704e44195f6d..5bd2eef739bc 100644
--- a/tests/wpt/web-platform-tests/pointerevents/extension/pointerevent_pointerrawupdate_in_pointerlock-manual.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_pointerrawupdate_in_pointerlock-manual.html
@@ -3,11 +3,11 @@
     <head>
         <title>pointerrawupdate</title>
         <meta name="viewport" content="width=device-width">
-        <link rel="stylesheet" type="text/css" href="../pointerevent_styles.css">
+        <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
         <!-- Additional helper script for common checks across event types -->
-        <script type="text/javascript" src="../pointerevent_support.js"></script>
+        <script type="text/javascript" src="pointerevent_support.js"></script>
     </head>
     <body onload="run()">
         <h2>pointerrawupdate</h2>
diff --git a/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-TAO.sub.html b/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-TAO.sub.html
index 468d055af95b..695bd654bb57 100644
--- a/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-TAO.sub.html
+++ b/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-TAO.sub.html
@@ -15,19 +15,6 @@
     test_namespace('getEntriesByName');
     const pageOrigin = get_host_info()['ORIGIN'];
     const crossOrigin = get_host_info()['REMOTE_ORIGIN'];
-
-    function onload_test()
-    {
-        const entries = performance.getEntriesByName(document.getElementById('frameContext').src, 'resource');
-        test_equals(entries.length, 1, 'There should be one entry.');
-        const entry = entries[0];
-
-        test_greater_than(entry.redirectStart, 0, 'redirectStart > 0 in cross-origin redirect with Timing-Allow-Origin.');
-        test_greater_than(entry.redirectEnd, 0, 'redirectEnd > 0 in cross-origin redirect with Timing-Allow-Origin.');
-        test_greater_than(entry.fetchStart, 0, 'fetchStart > 0 in cross-origin redirect.');
-        test_greater_than(entry.fetchStart, entry.startTime, 'startTime < fetchStart in cross-origin redirect with Timing-Allow-Origin.');
-        done();
-    }
 </script>
 
 </head>
@@ -36,13 +23,37 @@
 <script>
     let destUrl = pageOrigin + '/resource-timing/resources/multi_redirect.py?';
     destUrl += 'page_origin=' + pageOrigin;
-    destUrl += '&timing_allow=1';
     destUrl += '&cross_origin=' + crossOrigin;
-    destUrl += '&final_resource=' + "/resource-timing/resources/blank-with-tao.html";
+    destUrl += '&final_resource=' + "/resource-timing/resources/blue-with-tao.png";
     destUrl += '&tao_steps=3';
-    const frameContext = document.getElementById('frameContext');
-    frameContext.onload = onload_test;
-    frameContext.src = destUrl;
+    const taoStarImage = document.createElement('img');
+    taoStarImage.src = destUrl;
+    document.body.appendChild(taoStarImage);
+
+    destUrl += '&tao_value=' + pageOrigin;
+    // Due to the tainted origin flag, having the TAO header set to |pageOrigin| is insufficient.
+    // That is, the Timing-Allow-Origin check should fail in this case.
+    const taoPageOriginImage = document.createElement('img');
+    taoPageOriginImage.src = destUrl;
+    document.body.appendChild(taoPageOriginImage);
+
+    let visitedTaoStar = false;
+    let visitedTaoPageOrigin = false;
+    new PerformanceObserver(e => {
+        e.getEntries().forEach(entry => {
+            if (entry.name === taoStarImage.src) {
+                assert_false(visitedTaoStar);
+                visitedTaoStar = true;
+                test_tao_pass(entry);
+            } else if (entry.name === taoPageOriginImage.src) {
+                assert_false(visitedTaoPageOrigin);
+                visitedTaoPageOrigin = true;
+                test_tao_fail(entry);
+            }
+            if (visitedTaoStar && visitedTaoPageOrigin)
+                done();
+        });
+    }).observe({entryTypes: ['resource']});
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-no-TAO.sub.html b/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-no-TAO.sub.html
index d90387b3bbda..0c1d09684c7c 100644
--- a/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-no-TAO.sub.html
+++ b/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-no-TAO.sub.html
@@ -22,10 +22,7 @@
         test_equals(entries.length, 1, 'There should be one entry.');
         const entry = entries[0];
 
-        test_equals(entry.redirectStart, 0, 'redirectStart == 0 in cross-origin redirect with no Timing-Allow-Origin.');
-        test_equals(entry.redirectEnd, 0, 'redirectEnd == 0 in cross-origin redirect with no Timing-Allow-Origin.');
-        test_greater_than(entry.fetchStart, 0, 'fetchStart > 0 in cross-origin redirect.');
-        test_equals(entry.fetchStart, entry.startTime, 'startTime == fetchStart in cross-origin redirect with no Timing-Allow-Origin.');
+        test_tao_fail(entry);
         done();
     }
 </script>
diff --git a/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-partial-TAO.sub.html b/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-partial-TAO.sub.html
index 076a003b7c99..2f44b78d2785 100644
--- a/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-partial-TAO.sub.html
+++ b/tests/wpt/web-platform-tests/resource-timing/crossorigin-sandwich-partial-TAO.sub.html
@@ -22,10 +22,7 @@
         test_equals(entries.length, 1, 'There should be one entry.');
         const entry = entries[0];
 
-        test_equals(entry.redirectStart, 0, 'redirectStart == 0 in cross-origin redirect with Timing-Allow-Origin in some of the chain but not all of it.');
-        test_equals(entry.redirectEnd, 0, 'redirectEnd == 0 in cross-origin redirect with Timing-Allow-Origin in some of the chain but not all of it.');
-        test_greater_than(entry.fetchStart, 0, 'fetchStart > 0 in cross-origin redirect.');
-        test_equals(entry.fetchStart, entry.startTime, 'startTime == fetchStart in cross-origin redirect with Timing-Allow-Origin in some of the chain but not all of it.');
+        test_tao_fail(entry);
         done();
     }
 </script>
@@ -36,7 +33,6 @@
 <script>
     let destUrl = pageOrigin + '/resource-timing/resources/multi_redirect.py?';
     destUrl += 'page_origin=' + pageOrigin;
-    destUrl += '&timing_allow=1';
     destUrl += '&cross_origin=' + crossOrigin;
     destUrl += '&final_resource=' + "/resource-timing/resources/blank-with-tao.html";
     destUrl += '&tao_steps=2';
diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_TAO_cross_origin_redirect_chain.html b/tests/wpt/web-platform-tests/resource-timing/resource_TAO_cross_origin_redirect_chain.html
index 054a0e5643e7..292878bdde5f 100644
--- a/tests/wpt/web-platform-tests/resource-timing/resource_TAO_cross_origin_redirect_chain.html
+++ b/tests/wpt/web-platform-tests/resource-timing/resource_TAO_cross_origin_redirect_chain.html
@@ -39,7 +39,6 @@
     destUrl += '&cross_origin=' + get_host_info().HTTP_REMOTE_ORIGIN;
     destUrl += '&final_resource=' + "/resource-timing/resources/blank-with-tao.html";
     destUrl += '&tao_steps=3';
-    destUrl += '&timing_allow=1';
     const frameContext = document.getElementById('frameContext');
     frameContext.onload = onload_test;
     frameContext.src = destUrl;
diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png b/tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png
new file mode 100644
index 0000000000000000000000000000000000000000..820f8cace2143bfc45c0c301e84b6c29b8630068
GIT binary patch
literal 1010
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!Wi-X*q7}lMWc?smOq&xaLGB9lH
z=l+w(3gjy!dj$D1FjT2AFf_C<F#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R_G24;o;
zpAc6DhW|h{qhK@yMrH^cH_nOz`dp&KHKHUqKdq!Zu_%=xATcwqM9<GPM4`-B&)96`
z^GB*cH4dIGjv*P&Z!a{0g6i;spTY4DI9dY|4>T|`v++n6B;aK<+8d}OFfd9ReoF^w
N_jL7hS?83{1OVd{KuZ7s

literal 0
HcmV?d00001

diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png.headers b/tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png.headers
new file mode 100644
index 000000000000..7296361df3d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resource-timing/resources/blue-with-tao.png.headers
@@ -0,0 +1 @@
+Timing-Allow-Origin: *
diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/multi_redirect.py b/tests/wpt/web-platform-tests/resource-timing/resources/multi_redirect.py
index 99387c15bb61..037d986c7233 100644
--- a/tests/wpt/web-platform-tests/resource-timing/resources/multi_redirect.py
+++ b/tests/wpt/web-platform-tests/resource-timing/resources/multi_redirect.py
@@ -4,11 +4,13 @@ def main(request, response):
         2. Redirect to cross-origin URL
         3. Redirect to same-origin URL
         4. Final URL containing the final same-origin resource.
-    The request has three mandatory and one optional query parameters:
+    Mandatory parameters:
     page_origin - The page origin, used for redirection and to set TAO. This is a mandatory parameter.
     cross_origin - The cross origin used to make this a cross-origin redirect. This is a mandatory parameter.
     final_resource - Path of the final resource, without origin. This is a mandatory parameter.
-    timing_allow - Whether TAO should be set or not in the redirect chain. This is an optional parameter. Default: not set.
+    Optional parameters:
+    tao_steps - Number of redirects for which the TAO header will be present (a number 0 - 3 makes the most sense). Default value is 0.
+    tao_value - The value of the TAO header, when present. Default value is "*".
     Note that |step| is a parameter used internally for the multi-redirect. It's the step we're at in the redirect chain.
     """
     step = 1
@@ -22,23 +24,24 @@ def main(request, response):
     page_origin = request.GET.first("page_origin")
     cross_origin = request.GET.first("cross_origin")
     final_resource = request.GET.first("final_resource")
+
+    tao_value = "*";
+    if "tao_value" in request.GET:
+        tao_value = request.GET.first("tao_value")
     tao_steps = 0
     if "tao_steps" in request.GET:
         tao_steps = int(request.GET.first("tao_steps"))
-    timing_allow = "0"
-    if "timing_allow" in request.GET:
-        timing_allow = request.GET.first("timing_allow")
 
     next_tao_steps = tao_steps - 1
     redirect_url_path = "/resource-timing/resources/multi_redirect.py?"
     redirect_url_path += "page_origin=" + page_origin
     redirect_url_path += "&cross_origin=" + cross_origin
     redirect_url_path += "&final_resource=" + final_resource
-    redirect_url_path += "&timing_allow=" + timing_allow
+    redirect_url_path += "&tao_value=" + tao_value
     redirect_url_path += "&tao_steps=" + str(next_tao_steps)
     redirect_url_path += "&step="
-    if timing_allow != "0" and tao_steps > 0:
-        response.headers.set("timing-allow-origin", page_origin)
+    if tao_steps > 0:
+        response.headers.set("timing-allow-origin", tao_value)
 
     if step == 1:
         # On the first request, redirect to a cross origin URL
diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/webperftestharness.js b/tests/wpt/web-platform-tests/resource-timing/resources/webperftestharness.js
index 203eb0d16b4f..8e04e52f9c57 100644
--- a/tests/wpt/web-platform-tests/resource-timing/resources/webperftestharness.js
+++ b/tests/wpt/web-platform-tests/resource-timing/resources/webperftestharness.js
@@ -3,7 +3,7 @@ author: W3C http://www.w3.org/
 help: http://www.w3.org/TR/navigation-timing/#sec-window.performance-attribute
 */
 //
-// Helper Functions for NavigationTiming W3C tests
+// Helper Functions for ResourceTiming W3C tests
 //
 
 var performanceNamespace = window.performance;
@@ -150,3 +150,17 @@ function test_not_equals(value, notequals, msg, properties)
 {
     wp_test(function() { assert_true(value !== notequals, msg); }, msg, properties);
 }
+
+function test_tao_pass(entry) {
+    test_greater_than(entry.redirectStart, 0, 'redirectStart > 0 in cross-origin redirect with Timing-Allow-Origin.');
+    test_greater_than(entry.redirectEnd, 0, 'redirectEnd > 0 in cross-origin redirect with Timing-Allow-Origin.');
+    test_greater_than(entry.fetchStart, 0, 'fetchStart > 0 in cross-origin redirect with Timing-Allow-Origin.');
+    test_greater_than(entry.fetchStart, entry.startTime, 'startTime < fetchStart in cross-origin redirect with Timing-Allow-Origin.');
+}
+
+function test_tao_fail(entry) {
+    test_equals(entry.redirectStart, 0, 'redirectStart == 0 in cross-origin redirect with failing Timing-Allow-Origin.');
+    test_equals(entry.redirectEnd, 0, 'redirectEnd == 0 in cross-origin redirect with failing Timing-Allow-Origin.');
+    test_greater_than(entry.fetchStart, 0, 'fetchStart > 0 in cross-origin redirect with failing Timing-Allow-Origin.');
+    test_equals(entry.fetchStart, entry.startTime, 'startTime == fetchStart in cross-origin redirect with failing Timing-Allow-Origin.');
+}
diff --git a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
index c0921b8ad82f..b1de419ca20d 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
@@ -106,7 +106,7 @@ function assertNDEFReaderOptionsEqual(provided, received) {
 // Checks whether NDEFReaderOptions are matched with given message.
 function matchesWatchOptions(message, options) {
   // Filter by Web NFC id.
-  if (!matchesWebNfcId(message.url, options.url)) return false;
+  if (!matchesWebNfcId(message.url, options.id)) return false;
 
   // Matches any record / media type.
   if ((options.mediaType == null || options.mediaType === '') &&
@@ -298,13 +298,10 @@ var WebNFCTest = (() => {
 
     reset() {
       this.hw_status_ = NFCHWStatus.ENABLED;
-      this.push_completed_ = true;
       this.watchers_ = [];
       this.reading_messages_ = [];
       this.operations_suspended_ = false;
       this.cancelPendingPushOperation();
-      this.bindingSet_.closeAllBindings();
-      this.interceptor_.stop();
       this.is_ndef_tech_ = true;
       this.is_formatted_tag_ = false;
     }
@@ -389,15 +386,23 @@ var WebNFCTest = (() => {
       if (testInternal.initialized)
         throw new Error('Call reset() before initialize().');
 
-      testInternal.mockNFC = new MockNFC;
+      if (window.testRunner) {
+        // Grant nfc permissions for Chromium testrunner.
+        window.testRunner.setPermission('nfc', 'granted',
+                                        location.origin, location.origin);
+      }
+
+      if (testInternal.mockNFC == null) {
+        testInternal.mockNFC = new MockNFC();
+      }
       testInternal.initialized = true;
     }
-    // Resets state of nfc mocks between test runs.
+
+    // Reuses the nfc mock but resets its state between test runs.
     async reset() {
       if (!testInternal.initialized)
         throw new Error('Call initialize() before reset().');
       testInternal.mockNFC.reset();
-      testInternal.mockNFC = null;
       testInternal.initialized = false;
 
       await new Promise(resolve => setTimeout(resolve, 0));
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
index 653dcac79f8f..c4bfec3547d4 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
@@ -11,8 +11,6 @@ default_standing.matrix = [1, 0, 0, 0,
                            0, 1.65, 0, 1];
 const default_stage_parameters = {
   standingTransform: default_standing,
-  sizeX: 0,
-  sizeZ: 0,
   bounds: null
 };
 
diff --git a/tests/wpt/web-platform-tests/resources/sriharness.js b/tests/wpt/web-platform-tests/resources/sriharness.js
index d30d483e3296..f0d284e57b94 100644
--- a/tests/wpt/web-platform-tests/resources/sriharness.js
+++ b/tests/wpt/web-platform-tests/resources/sriharness.js
@@ -1,5 +1,3 @@
-// TODO(domfarolino): Refactor SRIScriptTest to just be a function instead of a
-// constructor, since there is no need to produce another object.
 var SRIScriptTest = function(pass, name, src, integrityValue, crossoriginValue, nonce) {
     this.pass = pass;
     this.name = "Script: " + name;
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup-timeout.html b/tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup-timeout.html
new file mode 100644
index 000000000000..c4947feef42a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup-timeout.html
@@ -0,0 +1,28 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="timeout" content="long">
+  <script src="/resources/testharness.js"></script>
+  <script src="../../nested-testharness.js"></script>
+  <title>promise_setup - timeout</title>
+</head>
+<body>
+<script>
+'use strict';
+promise_test(() => {
+  return makeTest(
+      () => {
+        test(() => {}, 'before');
+        promise_setup(() => new Promise(() => {}));
+        promise_test(() => Promise.resolve(), 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'TIMEOUT');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'NOTRUN');
+    });
+}, 'timeout when returned promise does not settle');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup.html b/tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup.html
new file mode 100644
index 000000000000..2abb10a476e6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/test/tests/unit/promise_setup.html
@@ -0,0 +1,333 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="/resources/testharness.js"></script>
+  <script src="../../nested-testharness.js"></script>
+  <title>promise_setup</title>
+</head>
+<body>
+<script>
+'use strict';
+promise_test(() => {
+  return makeTest(
+      () => {
+        // Ensure that the harness error is the result of explicit error
+        // handling
+        setup({ allow_uncaught_exception: true });
+
+        test(() => {}, 'before');
+        promise_setup({});
+        promise_test(() => Promise.resolve(), 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, undefined);
+    });
+}, 'Error when no function provided');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        test(() => {}, 'before');
+        promise_setup(() => Promise.resolve(), {});
+        promise_test(() => Promise.resolve(), 'after');
+        throw new Error('this error is expected');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'PASS');
+    });
+}, 'Does not apply unspecified configuration properties');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        var properties = {
+          allow_uncaught_exception: true
+        };
+        test(() => {}, 'before');
+        promise_setup(() => Promise.resolve(), properties);
+        promise_test(() => Promise.resolve(), 'after');
+        throw new Error('this error is expected');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'PASS');
+    });
+}, 'Ignores configuration properties when some tests have already run');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        var properties = {
+          allow_uncaught_exception: true
+        };
+        promise_setup(() => Promise.resolve(), properties);
+        promise_test(() => {
+          return new Promise((resolve) => {
+            setTimeout(() => {
+              resolve();
+              throw new Error('this error is expected');
+            });
+          });
+        }, 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'OK');
+      assert_equals(tests.after, 'PASS');
+    });
+}, 'Honors configuration properties');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        // Ensure that the harness error is the result of explicit error
+        // handling
+        setup({ allow_uncaught_exception: true });
+
+        test(() => {}, 'before');
+        promise_setup(() => { throw new Error('this error is expected'); });
+        promise_test(() => Promise.resolve(), 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'NOTRUN');
+    });
+}, 'Error for synchronous exceptions');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        // Ensure that the harness error is the result of explicit error
+        // handling
+        setup({ allow_uncaught_exception: true });
+
+        test(() => {}, 'before');
+        promise_setup(() => undefined);
+        promise_test(() => Promise.resolve(), 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'NOTRUN');
+    });
+}, 'Error for missing return value');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        // Ensure that the harness error is the result of explicit error
+        // handling
+        setup({ allow_uncaught_exception: true });
+
+        test(() => {}, 'before');
+        var noThen = Promise.resolve();
+        noThen.then = undefined;
+        promise_setup(() => noThen);
+        promise_test(() => Promise.resolve(), 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'NOTRUN');
+    });
+}, 'Error for non-thenable return value');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        // Ensure that the harness error is the result of explicit error
+        // handling
+        setup({ allow_uncaught_exception: true });
+
+        test(() => {}, 'before');
+        var poisonedThen = {
+          get then() {
+            throw new Error('this error is expected');
+          }
+        };
+        promise_setup(() => poisonedThen);
+        promise_test(() => Promise.resolve(), 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'NOTRUN');
+    });
+}, 'Error for "poisoned" `then` property');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        // Ensure that the harness error is the result of explicit error
+        // handling
+        setup({ allow_uncaught_exception: true });
+
+        test(() => {}, 'before');
+        var badThen = {
+          then() {
+            throw new Error('this error is expected');
+          }
+        };
+        promise_setup(() => badThen);
+        promise_test(() => Promise.resolve(), 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'NOTRUN');
+    });
+}, 'Error for synchronous error from `then` method');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        // Ensure that the harness error is the result of explicit error
+        // handling
+        setup({ allow_uncaught_exception: true });
+
+        test(() => {}, 'before');
+        promise_setup(() => Promise.resolve());
+        test(() => {}, 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, undefined);
+    });
+}, 'Error for subsequent invocation of `test`');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        // Ensure that the harness error is the result of explicit error
+        // handling
+        setup({ allow_uncaught_exception: true });
+
+        test(() => {}, 'before');
+        promise_setup(() => Promise.resolve());
+        async_test((t) => t.done(), 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, undefined);
+    });
+}, 'Error for subsequent invocation of `async_test`');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        // Ensure that the harness error is the result of explicit error
+        // handling
+        setup({ allow_uncaught_exception: true });
+
+        test(() => {}, 'before');
+        promise_setup(() => Promise.reject());
+        promise_test(() => Promise.resolve(), 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'NOTRUN');
+    });
+}, 'Error for rejected promise');
+
+promise_test(() => {
+  var expected_sequence = [
+    'test body',
+    'promise_setup begin',
+    'promise_setup end',
+    'promise_test body'
+  ];
+  var actual_sequence = window.actual_sequence = [];
+
+  return makeTest(
+      () => {
+        test(() => { parent.actual_sequence.push('test body'); }, 'before');
+        promise_setup(() => {
+          parent.actual_sequence.push('promise_setup begin');
+
+          return Promise.resolve()
+            .then(() => new Promise((resolve) => setTimeout(resolve, 300)))
+            .then(() => parent.actual_sequence.push('promise_setup end'));
+        });
+        promise_test(() => {
+          parent.actual_sequence.push('promise_test body');
+          return Promise.resolve();
+        }, 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'OK');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'PASS');
+      assert_array_equals(actual_sequence, expected_sequence);
+    });
+}, 'Waits for promise to settle');
+
+promise_test(() => {
+  var expected_sequence = [
+    'promise_test 1 begin',
+    'promise_test 1 end',
+    'promise_setup begin',
+    'promise_setup end',
+    'promise_test 2 body'
+  ];
+  var actual_sequence = window.actual_sequence = [];
+
+  return makeTest(
+      () => {
+        promise_test((t) => {
+          parent.actual_sequence.push('promise_test 1 begin');
+
+          return Promise.resolve()
+            .then(() => new Promise((resolve) => t.step_timeout(resolve, 300)))
+            .then(() => parent.actual_sequence.push('promise_test 1 end'));
+        }, 'before');
+        promise_setup(() => {
+          parent.actual_sequence.push('promise_setup begin');
+
+          return Promise.resolve()
+            .then(() => new Promise((resolve) => setTimeout(resolve, 300)))
+            .then(() => parent.actual_sequence.push('promise_setup end'));
+        });
+        promise_test(() => {
+          parent.actual_sequence.push('promise_test 2 body');
+          return Promise.resolve();
+        }, 'after');
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'OK');
+      assert_equals(tests.before, 'PASS');
+      assert_equals(tests.after, 'PASS');
+      assert_array_equals(actual_sequence, expected_sequence);
+    });
+}, 'Waits for existing promise_test to complete');
+
+promise_test(() => {
+  return makeTest(
+      () => {
+        var properties = { allow_uncaught_exception: true };
+        promise_test(() => {
+          return new Promise((resolve) => {
+            setTimeout(() => {
+              resolve();
+              throw new Error('this error is expected');
+            });
+          });
+        }, 'before');
+        promise_setup(() => Promise.resolve(), properties);
+      }
+    ).then(({harness, tests}) => {
+      assert_equals(harness, 'ERROR');
+      assert_equals(tests.before, 'PASS');
+    });
+}, 'Defers application of setup properties');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/web-platform-tests/resources/testharness.js
index 93809664ea34..f289e7797201 100644
--- a/tests/wpt/web-platform-tests/resources/testharness.js
+++ b/tests/wpt/web-platform-tests/resources/testharness.js
@@ -538,8 +538,12 @@ policies and contribution forms [3].
      */
     function test(func, name, properties)
     {
+        if (tests.promise_setup_called) {
+            tests.status.status = tests.status.ERROR;
+            tests.status.message = '`test` invoked after `promise_setup`';
+            tests.complete();
+        }
         var test_name = name ? name : test_environment.next_default_test_name();
-        properties = properties ? properties : {};
         var test_obj = new Test(test_name, properties);
         var value = test_obj.step(func, test_obj, test_obj);
 
@@ -564,13 +568,17 @@ policies and contribution forms [3].
 
     function async_test(func, name, properties)
     {
+        if (tests.promise_setup_called) {
+            tests.status.status = tests.status.ERROR;
+            tests.status.message = '`async_test` invoked after `promise_setup`';
+            tests.complete();
+        }
         if (typeof func !== "function") {
             properties = name;
             name = func;
             func = null;
         }
         var test_name = name ? name : test_environment.next_default_test_name();
-        properties = properties ? properties : {};
         var test_obj = new Test(test_name, properties);
         if (func) {
             test_obj.step(func, test_obj, test_obj);
@@ -579,7 +587,13 @@ policies and contribution forms [3].
     }
 
     function promise_test(func, name, properties) {
-        var test = async_test(name, properties);
+        if (typeof func !== "function") {
+            properties = name;
+            name = func;
+            func = null;
+        }
+        var test_name = name ? name : test_environment.next_default_test_name();
+        var test = new Test(test_name, properties);
         test._is_promise_test = true;
 
         // If there is no promise tests queue make one.
@@ -790,6 +804,44 @@ policies and contribution forms [3].
         test_environment.on_new_harness_properties(properties);
     }
 
+    function promise_setup(func, maybe_properties)
+    {
+        if (typeof func !== "function") {
+            tests.set_status(tests.status.ERROR,
+                             "promise_test invoked without a function");
+            tests.complete();
+            return;
+        }
+        tests.promise_setup_called = true;
+
+        if (!tests.promise_tests) {
+            tests.promise_tests = Promise.resolve();
+        }
+
+        tests.promise_tests = tests.promise_tests
+            .then(function()
+                  {
+                      var properties = maybe_properties || {};
+                      var result;
+
+                      tests.setup(null, properties);
+                      result = func();
+                      test_environment.on_new_harness_properties(properties);
+
+                      if (!result || typeof result.then !== "function") {
+                          throw "Non-thenable returned by function passed to `promise_setup`";
+                      }
+                      return result;
+                  })
+            .catch(function(e)
+                   {
+                       tests.set_status(tests.status.ERROR,
+                                        String(e),
+                                        e && e.stack);
+                       tests.complete();
+                   });
+    }
+
     function done() {
         if (tests.tests.length === 0) {
             // `done` is invoked after handling uncaught exceptions, so if the
@@ -852,6 +904,7 @@ policies and contribution forms [3].
     expose(promise_rejects_exactly, 'promise_rejects_exactly');
     expose(generate_tests, 'generate_tests');
     expose(setup, 'setup');
+    expose(promise_setup, 'promise_setup');
     expose(done, 'done');
     expose(on_event, 'on_event');
     expose(step_timeout, 'step_timeout');
@@ -1842,7 +1895,7 @@ policies and contribution forms [3].
         this.timeout_id = null;
         this.index = null;
 
-        this.properties = properties;
+        this.properties = properties || {};
         this.timeout_length = settings.test_timeout;
         if (this.timeout_length !== null) {
             this.timeout_length *= tests.timeout_multiplier;
@@ -2450,6 +2503,10 @@ policies and contribution forms [3].
         this.allow_uncaught_exception = false;
 
         this.file_is_test = false;
+        // This value is lazily initialized in order to avoid introducing a
+        // dependency on ECMAScript 2015 Promises to all tests.
+        this.promise_tests = null;
+        this.promise_setup_called = false;
 
         this.timeout_multiplier = 1;
         this.timeout_length = test_environment.test_timeout();
diff --git a/tests/wpt/web-platform-tests/screen-capture/feature-policy.https.html b/tests/wpt/web-platform-tests/screen-capture/feature-policy.https.html
index 56c9e80a1307..90b2019ef143 100644
--- a/tests/wpt/web-platform-tests/screen-capture/feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/screen-capture/feature-policy.https.html
@@ -1,17 +1,27 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <body>
-  <script src=/resources/testharness.js></script>
-  <script src=/resources/testharnessreport.js></script>
-  <script src=/common/get-host-info.sub.js></script>
-  <script src=/feature-policy/resources/featurepolicy.js></script>
+  <button id="button">User gesture</button>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script src="/common/get-host-info.sub.js"></script>
+  <script src="/feature-policy/resources/featurepolicy.js"></script>
   <script>
   'use strict';
 
-  async function gDM({audio, video}) {
+  async function getDisplayMedia(constraints) {
+    const p = new Promise(r => button.onclick = r);
+    await test_driver.click(button);
+    await p;
+    return navigator.mediaDevices.getDisplayMedia(constraints);
+  }
+
+  async function testGDM({audio, video}) {
     let stream;
     try {
-      stream = await navigator.mediaDevices.getDisplayMedia({audio, video});
+      stream = await getDisplayMedia({audio, video});
       if (stream.getVideoTracks().length == 0) {
         throw {name: `requested video track must be present with ` +
                      `audio ${audio} and video ${video}, or fail`};
@@ -29,9 +39,9 @@
     'display-capture',
     'NotAllowedError',
     async () => {
-      await gDM({video: true});
-      await gDM({audio: true, video: true});
-      await gDM({audio: true});
+      await testGDM({video: true});
+      await testGDM({audio: true, video: true});
+      await testGDM({audio: true});
     }
   );
   </script>
diff --git a/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html b/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html
index 7427e3433d01..284a145870e7 100644
--- a/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html
+++ b/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html
@@ -1,8 +1,11 @@
 <!doctype html>
 <meta charset=utf-8>
 <title>getDisplayMedia</title>
+<button id="button">User gesture</button>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
 <script>
   'use strict';
 test(() => {
@@ -12,14 +15,32 @@
 const stopTracks = stream => stream.getTracks().forEach(track => track.stop());
 const j = obj => JSON.stringify(obj);
 
+async function getDisplayMedia(constraints) {
+  const p = new Promise(r => button.onclick = r);
+  await test_driver.click(button);
+  await p;
+  return navigator.mediaDevices.getDisplayMedia(constraints);
+}
+
+promise_test(async t => {
+  try {
+    stopTracks(await navigator.mediaDevices.getDisplayMedia({video: true}));
+  } catch (err) {
+    assert_equals(err.name, 'InvalidStateError', err.message);
+    return;
+  }
+  assert_unreached('getDisplayMedia should have failed');
+}, `getDisplayMedia() must require user activation`);
+
 [
  {video: true},
  {video: true, audio: false},
  {audio: false},
+ {audio: true},
  {},
  undefined
 ].forEach(constraints => promise_test(async t => {
-  const stream = await navigator.mediaDevices.getDisplayMedia(constraints);
+  const stream = await getDisplayMedia(constraints);
   t.add_cleanup(() => stopTracks(stream));
   assert_equals(stream.getTracks().length, 1);
   assert_equals(stream.getVideoTracks().length, 1);
@@ -35,11 +56,10 @@
  {video: {height: {exact: 240}}},
  {video: {frameRate: {min: 4}}},
  {video: {frameRate: {exact: 4}}},
- {audio: true},
  {video: false, audio: true},
 ].forEach(constraints => promise_test(async t => {
   try {
-    stopTracks(await navigator.mediaDevices.getDisplayMedia(constraints));
+    stopTracks(await getDisplayMedia(constraints));
   } catch (err) {
     assert_equals(err.name, 'TypeError', err.message);
     return;
@@ -50,7 +70,7 @@
 [
  {video: true, audio: true},
 ].forEach(constraints => promise_test(async t => {
-  const stream = await navigator.mediaDevices.getDisplayMedia(constraints);
+  const stream = await getDisplayMedia(constraints);
   t.add_cleanup(() => stopTracks(stream));
   assert_greater_than_equal(stream.getTracks().length, 1);
   assert_less_than_equal(stream.getTracks().length, 2);
@@ -67,7 +87,7 @@
  {video: {frameRate: {max: 4}, height: {max: 240}}},
  {video: {frameRate: {max: 4}, width: {max: 360}, height: {max: 240}}},
 ].forEach(constraints => promise_test(async t => {
-  const stream = await navigator.mediaDevices.getDisplayMedia(constraints);
+  const stream = await getDisplayMedia(constraints);
   t.add_cleanup(() => stopTracks(stream));
   const {width, height, frameRate} = stream.getTracks()[0].getSettings();
   assert_greater_than_equal(width, 1);
@@ -93,7 +113,7 @@
  {video: {frameRate: {max: -1}}},
 ].forEach(constraints => promise_test(async t => {
   try {
-    stopTracks(await navigator.mediaDevices.getDisplayMedia(constraints));
+    stopTracks(await getDisplayMedia(constraints));
   } catch (err) {
     assert_equals(err.name, 'OverconstrainedError', err.message);
     return;
@@ -103,7 +123,19 @@
 
 // Content shell picks a fake desktop device by default.
 promise_test(async t => {
-  const stream = await navigator.mediaDevices.getDisplayMedia({video: true});
+  const stream = await getDisplayMedia({video: true});
+  t.add_cleanup(() => stopTracks(stream));
+  assert_equals(stream.getVideoTracks().length, 1);
+  const track = stream.getVideoTracks()[0];
+  assert_equals(track.kind, "video");
+  assert_equals(track.enabled, true);
+  assert_equals(track.readyState, "live");
+  track.stop();
+  assert_equals(track.readyState, "ended");
+}, 'getDisplayMedia() resolves with stream with video track');
+
+promise_test(async t => {
+  const stream = await getDisplayMedia({video: true});
   t.add_cleanup(() => stopTracks(stream));
   const settings = stream.getVideoTracks()[0].getSettings();
   assert_any(
diff --git a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/vary.py b/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/vary.py
index 59e39bc2ae73..a609d7e8758d 100644
--- a/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/vary.py
+++ b/tests/wpt/web-platform-tests/service-workers/cache-storage/resources/vary.py
@@ -1,3 +1,5 @@
+from six import text_type
+
 def main(request, response):
   if "clear-vary-value-override-cookie" in request.GET:
     response.unset_cookie("vary-value-override")
@@ -15,7 +17,7 @@ def main(request, response):
   # (including query), but differ by VARY header.
   cookie_vary = request.cookies.get("vary-value-override");
   if cookie_vary:
-    response.headers.set("vary", cookie_vary)
+    response.headers.set("vary", text_type(cookie_vary))
   else:
     # If there is no cookie, then use the query string value, if present.
     query_vary = request.GET.first("vary", default="")
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/referer-toplevel-script-fetch.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/referrer-toplevel-script-fetch.https.html
similarity index 52%
rename from tests/wpt/web-platform-tests/service-workers/service-worker/referer-toplevel-script-fetch.https.html
rename to tests/wpt/web-platform-tests/service-workers/service-worker/referrer-toplevel-script-fetch.https.html
index f0dd843eef8f..1a9bcf323d0b 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/referer-toplevel-script-fetch.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/referrer-toplevel-script-fetch.https.html
@@ -1,10 +1,12 @@
 <!DOCTYPE html>
-<title>Service Worker: check referer of top-level script fetch</title>
+<title>Service Worker: check referrer of top-level script fetch</title>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js?pipe=sub"></script>
 <script>
+
 async function get_toplevel_script_headers(worker) {
   worker.postMessage("getHeaders");
   return new Promise((resolve) => {
@@ -24,8 +26,17 @@
   t.add_cleanup(() => service_worker_unregister(t, scope));
   await wait_for_state(t, registration.installing, "activated");
 
-  const headers = await get_toplevel_script_headers(registration.active);
-  const expected_referer = host_info["HTTPS_ORIGIN"] + location.pathname;
-  assert_equals(headers["referer"], expected_referer);
-}, "Referer of the top-level script fetch should be the document URL");
+  const expected_referrer = host_info["HTTPS_ORIGIN"] + location.pathname;
+
+  // Check referrer for register().
+  const register_headers = await get_toplevel_script_headers(registration.active);
+  assert_equals(register_headers["referer"], expected_referrer, "referrer of register()");
+
+  // Check referrer for update().
+  await registration.update();
+  await wait_for_state(t, registration.installing, "installed");
+  const update_headers = await get_toplevel_script_headers(registration.waiting);
+  assert_equals(update_headers["referer"], expected_referrer, "referrer of update()");
+}, "Referrer of the top-level script fetch should be the document URL");
+
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.js
index 71aff5e50374..8d475912dcf9 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.js
@@ -1,3 +1,6 @@
+// Add a unique timestamp per request to induce service worker script update.
+// Time stamp: %TIMESTAMP%
+
 // The server injects the request headers here as a JSON string.
 const headersAsJson = `%HEADERS%`;
 const headers = JSON.parse(headersAsJson);
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.py b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.py
index 5666f19e7904..d3057057763c 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.py
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-request-headers-worker.py
@@ -1,5 +1,6 @@
 import json
 import os
+import time
 
 def main(request, response):
   path = os.path.join(os.path.dirname(__file__),
@@ -8,6 +9,7 @@ def main(request, response):
 
   data = {key:request.headers[key] for key,value in request.headers.iteritems()}
   body = body.replace("%HEADERS%", json.dumps(data))
+  body = body.replace("%TIMESTAMP%", str(time.time()))
 
   headers = []
   headers.append(("ETag", "etag"))
diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-method-delegatesFocus.html b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-method-delegatesFocus.html
index 9c61f663f88a..30d60f975d9a 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-method-delegatesFocus.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-method-delegatesFocus.html
@@ -236,5 +236,52 @@
   assert_equals(shadowRoot.activeElement, belowSlots);
 }, "focus() on host with delegatesFocus and already-focused non-first shadow descendant");
 
+function createNestedHosts(innerDelegatesFocus) {
+  // Structure:
+  // <div> outerHost
+  //   <input> outerLightChild
+  //   #shadowRoot outerShadow delegatesFocus=true
+  //     <span> innerHost
+  //       #shadowRoot inneShadow delegatesFocus=true/false
+  //         <input> innerShadowChild
+  //     <input> outerShadowChild
+  const outerHost = document.createElement('div');
+  const outerLightChild = document.createElement('input');
+  outerHost.appendChild(outerLightChild);
+  const innerHost = document.createElement('span');
+  const outerShadow = outerHost.attachShadow({mode: 'closed', delegatesFocus:true});
+  outerShadow.appendChild(innerHost);
+  const outerShadowChild = document.createElement('input');
+  outerShadow.appendChild(outerShadowChild);
+
+  const innerShadow = innerHost.attachShadow({mode: 'closed', delegatesFocus:innerDelegatesFocus});
+  const innerShadowChild = document.createElement('input');
+  innerShadow.appendChild(innerShadowChild);
+
+  document.body.insertBefore(outerHost, document.body.firstChild);
+  return {outerHost: outerHost,
+      outerLightChild: outerLightChild,
+      outerShadow: outerShadow,
+      outerShadowChild: outerShadowChild,
+      innerHost: innerHost,
+      innerShadow: innerShadow,
+      innerShadowChild: innerShadowChild};
+}
+
+test(() => {
+  const dom = createNestedHosts(false);
+  dom.outerHost.focus();
+  assert_equals(document.activeElement, dom.outerHost);
+  assert_equals(dom.outerShadow.activeElement, dom.innerHost);
+  assert_equals(dom.innerShadow.activeElement, dom.innerShadowChild);
+}, 'focus() on host with delegatesFocus with another host with no delegatesFocus and a focusable child');
+
+test(() => {
+  const dom = createNestedHosts(true);
+  dom.outerHost.focus();
+  assert_equals(document.activeElement, dom.outerHost);
+  assert_equals(dom.outerShadow.activeElement, dom.innerHost);
+  assert_equals(dom.innerShadow.activeElement, dom.innerShadowChild);
+}, 'focus() on host with delegatesFocus with another host with delegatesFocus and a focusable child');
 </script>
 
diff --git a/tests/wpt/web-platform-tests/shadow-dom/innerHTML-setter.xhtml b/tests/wpt/web-platform-tests/shadow-dom/innerHTML-setter.xhtml
new file mode 100644
index 000000000000..0122707e2a91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/innerHTML-setter.xhtml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:bar="bar">
+  <head>
+    <title>Test for Shadow DOM innerHTML setter in XML</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script>
+      <![CDATA[
+        // We define our custom elements lazily so we don't mess
+        // with the DOM during parsing.
+        customElements.define("custom-el-1",
+          class extends HTMLElement {
+            constructor() {
+              super();
+              this.attachShadow({ mode: "open" });
+              try { this.shadowRoot.innerHTML = "<span/>"; } catch (e) {}
+            }
+          });
+        function defineElements() {
+          // We define our custom elements whose behavior involves
+          // ancestors of our parent lazily, because otherwise the
+          // constructor runs before the element is in the DOM and has
+          // the ancestors set up.
+          customElements.define("custom-el-2",
+            class extends HTMLElement {
+              constructor() {
+                super();
+                this.attachShadow({ mode: "open" });
+                try { this.shadowRoot.innerHTML = "<span/>"; } catch (e) {}
+              }
+            });
+          customElements.define("custom-el-with-prefix",
+            class extends HTMLElement {
+              constructor() {
+                super();
+                this.attachShadow({ mode: "open" });
+                try {
+                  this.shadowRoot.innerHTML = "<bar:span/>";
+                } catch (e) {
+                  // Test will fail due to us not having the kid
+                }
+              }
+            });
+        }
+      ]]>
+    </script>
+  </head>
+  <body>
+    <custom-el-1 id="htmlDefault"/>
+    <span xmlns="foo" xmlns:html="http://www.w3.org/1999/xhtml">
+      <html:custom-el-2 id="fooDefault"/>
+    </span>
+    <custom-el-with-prefix id="prefixTest"/>
+    <script>
+      <![CDATA[
+        const htmlNS = "http://www.w3.org/1999/xhtml";
+        test(() => {
+          var el = document.getElementById("htmlDefault");
+          var kid = el.shadowRoot.firstChild;
+          assert_equals(kid.namespaceURI, htmlNS,
+                        "Kid's namespace should be our default");
+        }, "InnerHTML behavior on custom element in default XHTML namespace");
+
+        test(defineElements, "Setting up the custom elements");
+        test(() => {
+          var el = document.getElementById("fooDefault");
+          var kid = el.shadowRoot.firstChild;
+          assert_equals(kid.namespaceURI, "foo",
+                        "Kid's namespace should be our default");
+        }, "InnerHTML behavior on custom element in default 'foo' namespace");
+
+        test(() => {
+          var el = document.getElementById("prefixTest");
+          var kid = el.shadowRoot.firstChild;
+          assert_equals(kid.namespaceURI, "bar",
+                        "Kid's namespace should be based on ancestor prefix");
+        }, "InnerHTML behavior with prefixes on custom element");
+      ]]>
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/reference/green-100x100.html b/tests/wpt/web-platform-tests/svg/struct/reftests/reference/green-100x100.html
new file mode 100644
index 000000000000..f718ea6abfba
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/struct/reftests/reference/green-100x100.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<div style="width: 100px; height: 100px; background-color: green"></div>
diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg b/tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg
new file mode 100644
index 000000000000..6f7fb0f83015
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <symbol id="green-square" viewBox="0 0 16 16">
+    <rect width="16" height="16" fill="green"/>
+  </symbol>
+</svg>
diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg.headers b/tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg.headers
new file mode 100644
index 000000000000..3f0c26c8feaf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/struct/reftests/support/etag-max-age-zero-icons.svg.headers
@@ -0,0 +1,2 @@
+ETag: icons
+Cache-Control: max-age=0
diff --git a/tests/wpt/web-platform-tests/svg/struct/reftests/use-external-resource-with-revalidation.tentative.html b/tests/wpt/web-platform-tests/svg/struct/reftests/use-external-resource-with-revalidation.tentative.html
new file mode 100644
index 000000000000..d899165fa9cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/struct/reftests/use-external-resource-with-revalidation.tentative.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Multiple &lt;use> referencing same external resource, with revalidation required</title>
+<link rel="match" href="reference/green-100x100.html">
+<svg>
+  <rect width="100" height="100" fill="red"/>
+</svg>
+<script>
+  let container = document.querySelector('svg');
+  function makeUse(x) {
+    let use = document.createElementNS('http://www.w3.org/2000/svg', 'use');
+    use.setAttribute('href', 'support/etag-max-age-zero-icons.svg#green-square');
+    use.setAttribute('x', x);
+    use.setAttribute('width', 50);
+    use.setAttribute('height', 50);
+    use.setAttribute('transform', 'scale(1, 2)');
+    return use;
+  }
+  function insertFirstUse() {
+    let use = makeUse(0);
+    use.onload = insertSecondUse;
+    container.appendChild(use);
+  }
+  function insertSecondUse() {
+    let use = makeUse(50);
+    use.onload = endTest;
+    container.appendChild(use);
+    document.body.offsetTop;
+  }
+  function endTest() {
+    document.documentElement.classList.remove('reftest-wait');
+  }
+  onload = function() {
+    requestAnimationFrame(insertFirstUse);
+  };
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/ci/pr_preview.py b/tests/wpt/web-platform-tests/tools/ci/pr_preview.py
new file mode 100755
index 000000000000..ba7774446e08
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/ci/pr_preview.py
@@ -0,0 +1,408 @@
+#!/usr/bin/env python
+
+# The service provided by this script is not critical, but it shares a GitHub
+# API request quota with critical services. For this reason, all requests to
+# the GitHub API are preceded by a "guard" which verifies that the subsequent
+# request will not deplete the shared quota.
+#
+# In effect, this script will fail rather than interfere with the operation of
+# critical services.
+
+import argparse
+import json
+import logging
+import os
+import subprocess
+import time
+
+import requests
+
+# The ratio of "requests remaining" to "total request quota" below which this
+# script should refuse to interact with the GitHub.com API
+API_RATE_LIMIT_THRESHOLD = 0.2
+# The GitHub Pull Request label which indicates that a Pull Request is expected
+# to be actively mirrored by the preview server
+LABEL = 'safe for preview'
+# The number of seconds to wait between attempts to verify that a submission
+# preview is available on the Pull Request preview server
+POLLING_PERIOD = 5
+# Pull Requests from authors with the following associations to the project
+# should automatically receive previews
+#
+# https://developer.github.com/v4/enum/commentauthorassociation/ (equivalent
+# documentation for the REST API was not available at the time of writing)
+TRUSTED_AUTHOR_ASSOCIATIONS = ('COLLABORATOR', 'MEMBER', 'OWNER')
+# These GitHub accounts are not associated with individuals, and the Pull
+# Requests they submit rarely require a preview.
+AUTOMATION_GITHUB_USERS = (
+    'autofoolip', 'chromium-wpt-export-bot', 'moz-wptsync-bot',
+    'servo-wpt-sync'
+)
+DEPLOYMENT_PREFIX = 'wpt-preview-'
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+def gh_request(method_name, url, body=None, media_type=None):
+    github_token = os.environ['DEPLOY_TOKEN']
+
+    kwargs = {
+        'headers': {
+            'Authorization': 'token {}'.format(github_token),
+            'Accept': media_type or 'application/vnd.github.v3+json'
+        }
+    }
+    method = getattr(requests, method_name.lower())
+
+    if body is not None:
+        kwargs['json'] = body
+
+    logger.info('Issuing request: %s %s', method_name.upper(), url)
+
+    resp = method(url, **kwargs)
+
+    logger.info('Response status code: %s', resp.status_code)
+
+    resp.raise_for_status()
+
+    return resp.json()
+
+def guard(resource):
+    '''Decorate a `Project` instance method which interacts with the GitHub
+    API, ensuring that the subsequent request will not deplete the relevant
+    allowance. This verification does not itself influence rate limiting:
+
+    > Accessing this endpoint does not count against your REST API rate limit.
+
+    https://developer.github.com/v3/rate_limit/
+    '''
+    def guard_decorator(func):
+        def wrapped(self, *args, **kwargs):
+            limits = gh_request('GET', '{}/rate_limit'.format(self._host))
+
+            values = limits['resources'].get(resource)
+
+            remaining = values['remaining']
+            limit = values['limit']
+
+            logger.info(
+                'Limit for "%s" resource: %s/%s', resource, remaining, limit
+            )
+
+            if limit and float(remaining) / limit < API_RATE_LIMIT_THRESHOLD:
+                raise Exception(
+                    'Exiting to avoid GitHub.com API request throttling.'
+                )
+
+            return func(self, *args, **kwargs)
+        return wrapped
+    return guard_decorator
+
+class Project(object):
+    def __init__(self, host, github_project):
+        self._host = host
+        self._github_project = github_project
+
+    @guard('search')
+    def get_pull_requests(self, updated_since):
+        window_start = time.strftime('%Y-%m-%dT%H:%M:%SZ', updated_since)
+        url = '{}/search/issues?q=repo:{}+is:pr+updated:>{}'.format(
+            self._host, self._github_project, window_start
+        )
+
+        logger.info(
+            'Searching for Pull Requests updated since %s', window_start
+        )
+
+        data = gh_request('GET', url)
+
+        logger.info('Found %d Pull Requests', len(data['items']))
+
+        if data['incomplete_results']:
+            raise Exception('Incomplete results')
+
+        return data['items']
+
+    @guard('core')
+    def create_ref(self, refspec, revision):
+        url = '{}/repos/{}/git/refs'.format(self._host, self._github_project)
+
+        logger.info('Creating ref "%s" (%s)', refspec, revision)
+
+        gh_request('POST', url, {
+            'ref': 'refs/{}'.format(refspec),
+            'sha': revision
+        })
+
+    @guard('core')
+    def update_ref(self, refspec, revision):
+        url = '{}/repos/{}/git/refs/{}'.format(
+            self._host, self._github_project, refspec
+        )
+
+        logger.info('Updating ref "%s" (%s)', refspec, revision)
+
+        gh_request('PATCH', url, {'sha': revision})
+
+    @guard('core')
+    def create_deployment(self, pull_request, revision):
+        url = '{}/repos/{}/deployments'.format(
+            self._host, self._github_project
+        )
+        # The Pull Request preview system only exposes one Deployment for a
+        # given Pull Request. Identifying the Deployment by the Pull Request
+        # number ensures that GitHub.com automatically responds to new
+        # Deployments by designating prior Deployments as "inactive"
+        environment = DEPLOYMENT_PREFIX + str(pull_request['number'])
+
+        logger.info('Creating Deployment "%s" for "%s"', environment, revision)
+
+        return gh_request('POST', url, {
+            'ref': revision,
+            'environment': environment,
+            'auto_merge': False,
+            # Pull Request previews are created regardless of GitHub Commit
+            # Status Checks, so Status Checks should be ignored when creating
+            # GitHub Deployments.
+            'required_contexts': []
+        }, 'application/vnd.github.ant-man-preview+json')
+
+    @guard('core')
+    def get_deployment(self, revision):
+        url = '{}/repos/{}/deployments?sha={}'.format(
+            self._host, self._github_project, revision
+        )
+
+        deployments = gh_request('GET', url)
+
+        return deployments.pop() if len(deployments) else None
+
+    @guard('core')
+    def update_deployment(self, target, deployment, state, description=''):
+        if state in ('pending', 'success'):
+            environment_url = '{}/submissions/{}'.format(
+                target, deployment['environment']
+            )
+        else:
+            environment_url = None
+        url = '{}/repos/{}/deployments/{}/statuses'.format(
+            self._host, self._github_project, deployment['id']
+        )
+
+        gh_request('POST', url, {
+            'state': state,
+            'description': description,
+            'environment_url': environment_url
+        }, 'application/vnd.github.ant-man-preview+json')
+
+class Remote(object):
+    def __init__(self, github_project):
+        # The repository in the GitHub Actions environment is configured with
+        # a remote whose URL uses unauthenticated HTTPS, making it unsuitable
+        # for pushing changes.
+        self._token = os.environ['DEPLOY_TOKEN']
+
+    def get_revision(self, refspec):
+        output = subprocess.check_output([
+            'git',
+            '-c',
+            'credential.username={}'.format(self._token),
+            '-c',
+            'core.askPass=true',
+            'ls-remote',
+            'origin',
+            'refs/{}'.format(refspec)
+        ])
+
+        if not output:
+            return None
+
+        return output.decode('utf-8').split()[0]
+
+    def delete_ref(self, refspec):
+        full_ref = 'refs/{}'.format(refspec)
+
+        logger.info('Deleting ref "%s"', refspec)
+
+        subprocess.check_call([
+            'git',
+            '-c',
+            'credential.username={}'.format(self._token),
+            '-c',
+            'core.askPass=true',
+            'push',
+            'origin',
+            '--delete',
+            full_ref
+        ])
+
+def is_open(pull_request):
+    return not pull_request['closed_at']
+
+def has_mirroring_label(pull_request):
+    for label in pull_request['labels']:
+        if label['name'] == LABEL:
+            return True
+
+    return False
+
+def should_be_mirrored(pull_request):
+    return (
+        is_open(pull_request) and
+        pull_request['user']['login'] not in AUTOMATION_GITHUB_USERS and (
+            pull_request['author_association'] in TRUSTED_AUTHOR_ASSOCIATIONS or
+            has_mirroring_label(pull_request)
+        )
+    )
+
+def is_deployed(host, deployment):
+    worktree_name = deployment['environment'][len(DEPLOYMENT_PREFIX):]
+    response = requests.get(
+        '{}/.git/worktrees/{}/HEAD'.format(host, worktree_name)
+    )
+
+    if response.status_code != 200:
+        return False
+
+    return response.text.strip() == deployment['sha']
+
+def synchronize(host, github_project, window):
+    '''Inspect all Pull Requests which have been modified in a given window of
+    time. Add or remove the "preview" label and update or delete the relevant
+    git refs according to the status of each Pull Request.'''
+
+    project = Project(host, github_project)
+    remote = Remote(github_project)
+
+    pull_requests = project.get_pull_requests(
+        time.gmtime(time.time() - window)
+    )
+
+    for pull_request in pull_requests:
+        logger.info('Processing Pull Request #%(number)d', pull_request)
+
+        refspec_trusted = 'prs-trusted-for-preview/{number}'.format(
+            **pull_request
+        )
+        refspec_open = 'prs-open/{number}'.format(**pull_request)
+        revision_latest = remote.get_revision(
+            'pull/{number}/head'.format(**pull_request)
+        )
+        revision_trusted = remote.get_revision(refspec_trusted)
+        revision_open = remote.get_revision(refspec_open)
+
+        if should_be_mirrored(pull_request):
+            logger.info('Pull Request should be mirrored')
+
+            if revision_trusted is None:
+                project.create_ref(refspec_trusted, revision_latest)
+            elif revision_trusted != revision_latest:
+                project.update_ref(refspec_trusted, revision_latest)
+
+            if revision_open is None:
+                project.create_ref(refspec_open, revision_latest)
+            elif revision_open != revision_latest:
+                project.update_ref(refspec_open, revision_latest)
+
+            if project.get_deployment(revision_latest) is None:
+                project.create_deployment(
+                    pull_request, revision_latest
+                )
+        else:
+            logger.info('Pull Request should not be mirrored')
+
+            if not has_mirroring_label(pull_request) and revision_trusted is not None:
+                remote.delete_ref(refspec_trusted)
+
+            if revision_open is not None and not is_open(pull_request):
+                remote.delete_ref(refspec_open)
+
+def detect(host, github_project, target, timeout):
+    '''Manage the status of a GitHub Deployment by polling the Pull Request
+    preview website until the Deployment is complete or a timeout is
+    reached.'''
+
+    project = Project(host, github_project)
+
+    with open(os.environ['GITHUB_EVENT_PATH']) as handle:
+        data = json.loads(handle.read())
+
+    logger.info('Event data: %s', json.dumps(data, indent=2))
+
+    deployment = data['deployment']
+
+    if not deployment['environment'].startswith(DEPLOYMENT_PREFIX):
+        logger.info(
+            'Deployment environment "%s" is unrecognized. Exiting.',
+            deployment['environment']
+        )
+        return
+
+    message = 'Waiting up to {} seconds for Deployment {} to be available on {}'.format(
+        timeout, deployment['environment'], target
+    )
+    logger.info(message)
+    project.update_deployment(target, deployment, 'pending', message)
+
+    start = time.time()
+
+    while not is_deployed(target, deployment):
+        if time.time() - start > timeout:
+            message = 'Deployment did not become available after {} seconds'.format(timeout)
+            project.update_deployment(target, deployment, 'error', message)
+            raise Exception(message)
+
+        time.sleep(POLLING_PERIOD)
+
+    result = project.update_deployment(target, deployment, 'success')
+    logger.info(json.dumps(result, indent=2))
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description='''Synchronize the state of a GitHub.com project with the
+            underlying git repository in order to support a externally-hosted
+            Pull Request preview system. Communicate the state of that system
+            via GitHub Deployments associated with each Pull Request.'''
+    )
+    parser.add_argument(
+        '--host', required=True, help='the location of the GitHub API server'
+    )
+    parser.add_argument(
+        '--github-project',
+        required=True,
+        help='''the GitHub organization and GitHub project name, separated by
+            a forward slash (e.g. "web-platform-tests/wpt")'''
+    )
+    subparsers = parser.add_subparsers(title='subcommands')
+
+    parser_sync = subparsers.add_parser(
+        'synchronize', help=synchronize.__doc__
+    )
+    parser_sync.add_argument(
+        '--window',
+        type=int,
+        required=True,
+        help='''the number of seconds prior to the current moment within which
+            to search for GitHub Pull Requests. Any Pull Requests updated in
+            this time frame will be considered for synchronization.'''
+    )
+    parser_sync.set_defaults(func=synchronize)
+
+    parser_detect = subparsers.add_parser('detect', help=detect.__doc__)
+    parser_detect.add_argument(
+        '--target',
+        required=True,
+        help='''the URL of the website to which submission previews are
+            expected to become available'''
+    )
+    parser_detect.add_argument(
+        '--timeout',
+        type=int,
+        required=True,
+        help='''the number of seconds to wait for a submission preview to
+            become available before reporting a GitHub Deployment failure'''
+    )
+    parser_detect.set_defaults(func=detect)
+
+    values = dict(vars(parser.parse_args()))
+    values.pop('func')(**values)
diff --git a/tests/wpt/web-platform-tests/tools/ci/tests/test_pr_preview.py b/tests/wpt/web-platform-tests/tools/ci/tests/test_pr_preview.py
new file mode 100644
index 000000000000..63482fb184c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/ci/tests/test_pr_preview.py
@@ -0,0 +1,720 @@
+try:
+    from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
+except ImportError:
+    # Python 3 case
+    from http.server import BaseHTTPRequestHandler, HTTPServer
+import contextlib
+import errno
+import json
+import os
+import shutil
+import stat
+import subprocess
+import tempfile
+import threading
+
+subject = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), '..', 'pr_preview.py'
+)
+test_host = 'localhost'
+
+
+def same_members(a, b):
+    if len(a) != len(b):
+        return False
+    a_copy = list(a)
+    for elem in b:
+        try:
+            a_copy.remove(elem)
+        except ValueError:
+            return False
+
+    return len(a_copy) == 0
+
+
+# When these tests are executed in Windows, files in the temporary git
+# repositories may be marked as "read only" at the moment they are intended to
+# be deleted. The following handler for `shutil.rmtree` accounts for this by
+# making the files writable and attempting to delete them a second time.
+#
+# Source:
+# https://stackoverflow.com/questions/1213706/what-user-do-python-scripts-run-as-in-windows
+def handle_remove_readonly(func, path, exc):
+    excvalue = exc[1]
+    candidates = (os.rmdir, os.remove, os.unlink)
+    if func in candidates and excvalue.errno == errno.EACCES:
+        os.chmod(path, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)  # 0777
+        func(path)
+    else:
+        raise
+
+
+class MockHandler(BaseHTTPRequestHandler, object):
+    def do_all(self):
+        path = self.path.split('?')[0]
+        request_body = None
+
+        if 'Content-Length' in self.headers:
+            request_body = self.rfile.read(
+                int(self.headers['Content-Length'])
+            ).decode('utf-8')
+
+            if self.headers.get('Content-Type') == 'application/json':
+                request_body = json.loads(request_body)
+
+        for request, response in self.server.expected_traffic:
+            if request[0] != self.command:
+                continue
+            if request[1] != path:
+                continue
+            body_matches = True
+            for key in request[2]:
+                body_matches &= request[2][key] == request_body.get(key)
+            if not body_matches:
+                continue
+            break
+        else:
+            request = (self.command, path, request_body)
+            response = (400, {})
+
+        self.server.actual_traffic.append((request, response))
+        self.send_response(response[0])
+        self.end_headers()
+        self.wfile.write(json.dumps(response[1]).encode('utf-8'))
+
+    def do_DELETE(self):
+        return self.do_all()
+
+    def do_GET(self):
+        return self.do_all()
+
+    def do_PATCH(self):
+        return self.do_all()
+
+    def do_POST(self):
+        return self.do_all()
+
+
+class MockServer(HTTPServer, object):
+    '''HTTP server that responds to all requests with status code 200 and body
+    '{}' unless an alternative status code and body are specified for the given
+    method and path in the `responses` parameter.'''
+    def __init__(self, address, expected_traffic):
+        super(MockServer, self).__init__(address, MockHandler)
+        self.expected_traffic = expected_traffic
+        self.actual_traffic = []
+
+    def __enter__(self):
+        threading.Thread(target=lambda: self.serve_forever()).start()
+        return self
+
+    def __exit__(self, *args):
+        self.shutdown()
+
+
+class Requests(object):
+    get_rate = ('GET', '/rate_limit', {})
+    search = ('GET', '/search/issues', {})
+    ref_create_open = (
+        'POST', '/repos/test-org/test-repo/git/refs', {'ref':'refs/prs-open/23'}
+    )
+    ref_create_trusted = (
+        'POST',
+        '/repos/test-org/test-repo/git/refs',
+        {'ref':'refs/prs-trusted-for-preview/23'}
+    )
+    ref_update_open = (
+        'PATCH', '/repos/test-org/test-repo/git/refs/prs-open/23', {}
+    )
+    ref_update_trusted = (
+        'PATCH', '/repos/test-org/test-repo/git/refs/prs-trusted-for-preview/23', {}
+    )
+    deployment_get = ('GET', '/repos/test-org/test-repo/deployments', {})
+    deployment_create = ('POST', '/repos/test-org/test-repo/deployments', {})
+    deployment_status_create_pending = (
+        'POST',
+        '/repos/test-org/test-repo/deployments/24601/statuses',
+        {'state':'pending'}
+    )
+    deployment_status_create_error = (
+        'POST',
+        '/repos/test-org/test-repo/deployments/24601/statuses',
+        {'state':'error'}
+    )
+    deployment_status_create_success = (
+        'POST',
+        '/repos/test-org/test-repo/deployments/24601/statuses',
+        {'state':'success'}
+    )
+    preview = ('GET', '/.git/worktrees/45/HEAD', {})
+
+
+class Responses(object):
+    no_limit = (200, {
+        'resources': {
+            'search': {
+                'remaining': 100,
+                'limit': 100
+            },
+            'core': {
+                'remaining': 100,
+                'limit': 100
+            }
+        }
+    })
+
+
+@contextlib.contextmanager
+def temp_repo():
+    directory = tempfile.mkdtemp()
+
+    try:
+        subprocess.check_call(['git', 'init'], cwd=directory)
+        subprocess.check_call(
+            ['git', 'config', 'user.name', 'example'],
+            cwd=directory
+        )
+        subprocess.check_call(
+            ['git', 'config', 'user.email', 'example@example.com'],
+            cwd=directory
+        )
+        subprocess.check_call(
+            ['git', 'commit', '--allow-empty', '-m', 'first'],
+            cwd=directory
+        )
+
+        yield directory
+    finally:
+        shutil.rmtree(
+            directory, ignore_errors=False, onerror=handle_remove_readonly
+        )
+
+def synchronize(expected_traffic, refs={}):
+    env = {
+        'DEPLOY_TOKEN': 'c0ffee'
+    }
+    env.update(os.environ)
+    server = MockServer((test_host, 0), expected_traffic)
+    test_port = server.server_address[1]
+    remote_refs = {}
+
+    with temp_repo() as local_repo, temp_repo() as remote_repo, server:
+        subprocess.check_call(
+            ['git', 'commit', '--allow-empty', '-m', 'first'],
+            cwd=remote_repo
+        )
+        subprocess.check_call(
+            ['git', 'commit', '--allow-empty', '-m', 'second'],
+            cwd=remote_repo
+        )
+        subprocess.check_call(
+            ['git', 'remote', 'add', 'origin', remote_repo], cwd=local_repo
+        )
+
+        for name, value in refs.items():
+            subprocess.check_call(
+                ['git', 'update-ref', name, value],
+                cwd=remote_repo
+            )
+
+        child = subprocess.Popen(
+            [
+                'python',
+                subject,
+                '--host',
+                'http://{}:{}'.format(test_host, test_port),
+                '--github-project',
+                'test-org/test-repo',
+                'synchronize',
+                '--window',
+                '3000'
+            ],
+            cwd=local_repo,
+            env=env
+        )
+
+        child.communicate()
+        lines = subprocess.check_output(
+            ['git', 'ls-remote', 'origin'], cwd=local_repo
+        )
+        for line in lines.decode('utf-8').strip().split('\n'):
+            revision, ref = line.split()
+
+            if not ref or ref in ('HEAD', 'refs/heads/master'):
+                continue
+
+            remote_refs[ref] = revision
+
+    return child.returncode, server.actual_traffic, remote_refs
+
+
+def detect(event, expected_github_traffic, expected_preview_traffic):
+    env = {
+        'DEPLOY_TOKEN': 'c0ffee'
+    }
+    env.update(os.environ)
+    github_server = MockServer((test_host, 0), expected_github_traffic)
+    github_port = github_server.server_address[1]
+    preview_server = MockServer((test_host, 0), expected_preview_traffic)
+    preview_port = preview_server.server_address[1]
+
+    with temp_repo() as repo, github_server, preview_server:
+        env['GITHUB_EVENT_PATH'] = repo + '/event.json'
+
+        with open(env['GITHUB_EVENT_PATH'], 'w') as handle:
+            handle.write(json.dumps(event))
+
+        child = subprocess.Popen(
+            [
+                'python',
+                subject,
+                '--host',
+                'http://{}:{}'.format(test_host, github_port),
+                '--github-project',
+                'test-org/test-repo',
+                'detect',
+                '--target',
+                'http://{}:{}'.format(test_host, preview_port),
+                '--timeout',
+                '1'
+            ],
+            cwd=repo,
+            env=env
+        )
+        child.communicate()
+
+    return (
+        child.returncode,
+        github_server.actual_traffic,
+        preview_server.actual_traffic
+    )
+
+
+def test_synchronize_zero_results():
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.search, (
+            200,
+            {
+                'items': [],
+                'incomplete_results': False
+            }
+        ))
+    ]
+
+    returncode, actual_traffic, remote_refs = synchronize(expected_traffic)
+
+    assert returncode == 0
+    assert same_members(expected_traffic, actual_traffic)
+
+def test_synchronize_fail_search_throttled():
+    expected_traffic = [
+        (Requests.get_rate, (
+            200,
+            {
+                'resources': {
+                    'search': {
+                        'remaining': 1,
+                        'limit': 10
+                    }
+                }
+            }
+        ))
+    ]
+
+    returncode, actual_traffic, remote_refs = synchronize(expected_traffic)
+
+    assert returncode != 0
+    assert same_members(expected_traffic, actual_traffic)
+
+def test_synchronize_fail_incomplete_results():
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.search, (
+            200,
+            {
+                'items': [],
+                'incomplete_results': True
+            }
+        ))
+    ]
+
+    returncode, actual_traffic, remove_refs = synchronize(expected_traffic)
+
+    assert returncode != 0
+    assert same_members(expected_traffic, actual_traffic)
+
+def test_synchronize_ignore_closed():
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.search, (
+            200,
+            {
+                'items': [
+                    {
+                        'number': 23,
+                        'labels': [],
+                        'closed_at': '2019-10-28',
+                        'user': {'login': 'grace'},
+                        'author_association': 'COLLABORATOR'
+                    }
+                ],
+                'incomplete_results': False
+            }
+        ))
+    ]
+
+    returncode, actual_traffic, remote_refs = synchronize(expected_traffic)
+
+    assert returncode == 0
+    assert same_members(expected_traffic, actual_traffic)
+
+def test_synchronize_sync_collaborator():
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.search, (
+            200,
+            {
+                'items': [
+                    {
+                        'number': 23,
+                        'labels': [],
+                        'closed_at': None,
+                        'user': {'login': 'grace'},
+                        'author_association': 'COLLABORATOR'
+                    }
+                ],
+                'incomplete_results': False
+            }
+        )),
+        (Requests.ref_create_open, (200, {})),
+        (Requests.ref_create_trusted, (200, {})),
+        (Requests.deployment_get, (200, {})),
+        (Requests.deployment_create, (200, {}))
+    ]
+
+    returncode, actual_traffic, remote_refs = synchronize(expected_traffic)
+
+    assert returncode == 0
+    assert same_members(expected_traffic, actual_traffic)
+
+def test_synchronize_ignore_collaborator_bot():
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.search, (
+            200,
+            {
+                'items': [
+                    {
+                        'number': 23,
+                        'labels': [],
+                        'closed_at': None,
+                        'user': {'login': 'chromium-wpt-export-bot'},
+                        'author_association': 'COLLABORATOR'
+                    }
+                ],
+                'incomplete_results': False
+            }
+        ))
+    ]
+
+    returncode, actual_traffic, remote_refs = synchronize(expected_traffic)
+
+    assert returncode == 0
+    assert same_members(expected_traffic, actual_traffic)
+
+def test_synchronize_ignore_untrusted_contributor():
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.search, (
+            200,
+            {
+                'items': [
+                    {
+                        'number': 23,
+                        'labels': [],
+                        'closed_at': None,
+                        'user': {'login': 'grace'},
+                        'author_association': 'CONTRIBUTOR'
+                    }
+                ],
+                'incomplete_results': False
+            }
+        ))
+    ]
+
+    returncode, actual_traffic, remote_refs = synchronize(expected_traffic)
+
+    assert returncode == 0
+    assert same_members(expected_traffic, actual_traffic)
+
+def test_synchronize_sync_trusted_contributor():
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.search, (
+            200,
+            {
+                'items': [
+                    {
+                        'number': 23,
+                        'labels': [{'name': 'safe for preview'}],
+                        'closed_at': None,
+                        'user': {'login': 'Hexcles'},
+                        'author_association': 'CONTRIBUTOR'
+                    }
+                ],
+                'incomplete_results': False
+            }
+        )),
+        (Requests.ref_create_open, (200, {})),
+        (Requests.ref_create_trusted, (200, {})),
+        (Requests.deployment_get, (200, [])),
+        (Requests.deployment_create, (200, {}))
+    ]
+
+    returncode, actual_traffic, remote_refs = synchronize(expected_traffic)
+
+    assert returncode == 0
+    assert same_members(expected_traffic, actual_traffic)
+
+def test_synchronize_update_collaborator():
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.search, (200,
+            {
+                'items': [
+                    {
+                        'number': 23,
+                        'labels': [],
+                        'closed_at': None,
+                        'user': {'login': 'grace'},
+                        'author_association': 'COLLABORATOR'
+                    }
+                ],
+                'incomplete_results': False
+            }
+        )),
+        (Requests.deployment_get, (200, [])),
+        (Requests.ref_update_open, (200, {})),
+        (Requests.ref_update_trusted, (200, {})),
+        (Requests.deployment_create, (200, {}))
+    ]
+    refs = {
+        'refs/pull/23/head': 'HEAD',
+        'refs/prs-open/23': 'HEAD~',
+        'refs/prs-trusted-for-preview/23': 'HEAD~'
+    }
+
+    returncode, actual_traffic, remote_refs = synchronize(expected_traffic, refs)
+
+    assert returncode == 0
+    assert same_members(expected_traffic, actual_traffic)
+
+def test_synchronize_update_member():
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.search, (200,
+            {
+                'items': [
+                    {
+                        'number': 23,
+                        'labels': [],
+                        'closed_at': None,
+                        'user': {'login': 'grace'},
+                        'author_association': 'MEMBER'
+                    }
+                ],
+                'incomplete_results': False
+            }
+        )),
+        (Requests.deployment_get, (200, [{'some': 'deployment'}])),
+        (Requests.ref_update_open, (200, {})),
+        (Requests.ref_update_trusted, (200, {}))
+    ]
+    refs = {
+        'refs/pull/23/head': 'HEAD',
+        'refs/prs-open/23': 'HEAD~',
+        'refs/prs-trusted-for-preview/23': 'HEAD~'
+    }
+
+    returncode, actual_traffic, remote_refs = synchronize(expected_traffic, refs)
+
+    assert returncode == 0
+    assert same_members(expected_traffic, actual_traffic)
+
+def test_synchronize_delete_collaborator():
+    expected_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.search, (200,
+            {
+                'items': [
+                    {
+                        'number': 23,
+                        'labels': [],
+                        'closed_at': '2019-10-30',
+                        'user': {'login': 'grace'},
+                        'author_association': 'COLLABORATOR'
+                    }
+                ],
+                'incomplete_results': False
+            }
+        ))
+    ]
+    refs = {
+        'refs/pull/23/head': 'HEAD',
+        'refs/prs-open/23': 'HEAD~',
+        'refs/prs-trusted-for-preview/23': 'HEAD~'
+    }
+
+    returncode, actual_traffic, remote_refs = synchronize(expected_traffic, refs)
+
+    assert returncode == 0
+    assert same_members(expected_traffic, actual_traffic)
+    assert list(remote_refs) == ['refs/pull/23/head']
+
+def test_detect_ignore_unknown_env():
+    expected_github_traffic = []
+    expected_preview_traffic = []
+    event = {
+        'deployment': {
+            'id': 24601,
+            'environment': 'ghosts',
+            'sha': '3232'
+        }
+    }
+
+    returncode, actual_github_traffic, actual_preview_traffic = detect(
+        event, expected_github_traffic, expected_preview_traffic
+    )
+
+    assert returncode == 0
+    assert len(actual_github_traffic) == 0
+    assert len(actual_preview_traffic) == 0
+
+def test_detect_fail_search_throttled():
+    expected_github_traffic = [
+        (Requests.get_rate, (
+            200,
+            {
+                'resources': {
+                    'core': {
+                        'remaining': 1,
+                        'limit': 10
+                    }
+                }
+            }
+        ))
+    ]
+    expected_preview_traffic = []
+    event = {
+        'deployment': {
+            'id': 24601,
+            'environment': 'wpt-preview-45',
+            'sha': '3232'
+        }
+    }
+
+    returncode, actual_github_traffic, actual_preview_traffic = detect(
+        event, expected_github_traffic, expected_preview_traffic
+    )
+
+    assert returncode == 1
+    assert actual_github_traffic == expected_github_traffic
+    assert actual_preview_traffic == expected_preview_traffic
+
+def test_detect_success():
+    expected_github_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.deployment_status_create_pending, (200, {})),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.deployment_status_create_success, (200, {}))
+    ]
+    expected_preview_traffic = [
+        (Requests.preview, (200, 3232))
+    ]
+    event = {
+        'deployment': {
+            'id': 24601,
+            'environment': 'wpt-preview-45',
+            'sha': '3232'
+        }
+    }
+
+    returncode, actual_github_traffic, actual_preview_traffic = detect(
+        event, expected_github_traffic, expected_preview_traffic
+    )
+
+    assert returncode == 0
+    assert actual_github_traffic == expected_github_traffic
+    assert actual_preview_traffic == expected_preview_traffic
+
+def test_detect_timeout_missing():
+    expected_github_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.deployment_status_create_pending, (200, {})),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.deployment_status_create_error, (200, {}))
+    ]
+    expected_preview_traffic = [
+        (Requests.preview, (404, {}))
+    ]
+    event = {
+        'deployment': {
+            'id': 24601,
+            'environment': 'wpt-preview-45',
+            'sha': '3232'
+        }
+    }
+
+    returncode, actual_github_traffic, actual_preview_traffic = detect(
+        event, expected_github_traffic, expected_preview_traffic
+    )
+
+    assert returncode == 1
+    assert expected_github_traffic == actual_github_traffic
+    ping_count = len(actual_preview_traffic)
+    assert ping_count > 0
+    assert actual_preview_traffic == expected_preview_traffic * ping_count
+
+def test_detect_timeout_wrong_revision():
+    expected_github_traffic = [
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.deployment_status_create_pending, (200, {})),
+        (Requests.get_rate, Responses.no_limit),
+        (Requests.deployment_status_create_error, (200, {}))
+    ]
+    expected_preview_traffic = [
+        (Requests.preview, (200, 1234))
+    ]
+    event = {
+        'deployment': {
+            'id': 24601,
+            'environment': 'wpt-preview-45',
+            'sha': '3232'
+        }
+    }
+
+    returncode, actual_github_traffic, actual_preview_traffic = detect(
+        event, expected_github_traffic, expected_preview_traffic
+    )
+
+    assert returncode == 1
+    assert expected_github_traffic == actual_github_traffic
+    ping_count = len(actual_preview_traffic)
+    assert ping_count > 0
+    assert actual_preview_traffic == expected_preview_traffic * ping_count
diff --git a/tests/wpt/web-platform-tests/tools/requirements_flake8.txt b/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
index ae35da67e53f..0a4522401641 100644
--- a/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
+++ b/tests/wpt/web-platform-tests/tools/requirements_flake8.txt
@@ -1,4 +1,4 @@
 flake8==3.7.9
 pycodestyle==2.5.0
 pyflakes==2.1.1
-pep8-naming==0.9.0
+pep8-naming==0.9.1
diff --git a/tests/wpt/web-platform-tests/tools/tox.ini b/tests/wpt/web-platform-tests/tools/tox.ini
index a330d0523486..7a5c1eb648a9 100644
--- a/tests/wpt/web-platform-tests/tools/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/tox.ini
@@ -8,6 +8,8 @@ deps =
   pytest-cov
   mock
   hypothesis
+  # `requests` is required by `pr_preview.py`
+  requests
 
 commands = pytest {posargs}
 
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/__init__.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/__init__.py
index 217bfc652722..d860b9ea2533 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/__init__.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/__init__.py
@@ -1,6 +1,6 @@
 # flake8: noqa
 
-from client import (
+from .client import (
     Cookies,
     Element,
     Find,
@@ -8,7 +8,7 @@
     Session,
     Timeouts,
     Window)
-from error import (
+from .error import (
     ElementNotSelectableException,
     ElementNotVisibleException,
     InvalidArgumentException,
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index 0bddd7b13738..0c5bbff56298 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -1,10 +1,9 @@
-import urlparse
-
-import error
-import protocol
-import transport
+from . import error
+from . import protocol
+from . import transport
 
 from six import string_types
+from six.moves.urllib import parse as urlparse
 
 
 def command(func):
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/error.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/error.py
index 23ffc40b31ff..0647e7eb61f8 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/error.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/error.py
@@ -1,6 +1,7 @@
 import collections
 import json
 
+from six import itervalues
 
 class WebDriverException(Exception):
     http_status = None
@@ -205,6 +206,6 @@ def get(error_code):
 
 
 _errors = collections.defaultdict()
-for item in locals().values():
+for item in list(itervalues(locals())):
     if type(item) == type and issubclass(item, WebDriverException):
         _errors[item.status_code] = item
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
index e9574006365f..32ba31a2ae9a 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/transport.py
@@ -1,9 +1,9 @@
-import httplib
 import json
 import select
-import urlparse
+from six.moves.urllib import parse as urlparse
+from six.moves import http_client as httplib
 
-import error
+from . import error
 
 from six import text_type
 
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index fb10d7563130..e7d57d8638c2 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -91,7 +91,6 @@ class Firefox(Browser):
 
     product = "firefox"
     binary = "browsers/firefox/firefox"
-    platform_ini = "browsers/firefox/platform.ini"
     requirements = "requirements_firefox.txt"
 
     platform = {
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index 44dfbc25fa58..4c1f2c99128d 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -476,8 +476,8 @@ def setup_kwargs(self, kwargs):
                 kwargs["webdriver_binary"] = webdriver_binary
             else:
                 raise WptrunError("Unable to locate or install msedgedriver binary")
-        if browser_channel == "dev":
-            logger.info("Automatically turning on experimental features for Edge Dev")
+        if browser_channel in ("dev", "canary"):
+            logger.info("Automatically turning on experimental features for Edge Dev/Canary")
             kwargs["binary_args"].append("--enable-experimental-web-platform-features")
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
index 60775f8259eb..3cd01446e25b 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
@@ -3,6 +3,6 @@ mozinfo==1.1.0
 mozlog==5.0
 mozdebug==0.1.1
 pillow==6.2.1
-urllib3[secure]==1.25.6
+urllib3[secure]==1.25.7
 requests==2.22.0
 six==1.13.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index 14f456aa4767..7a936592f888 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -213,7 +213,7 @@ def get_test_window(self, window_id, parent, timeout=5):
                 handles = self.marionette.window_handles
                 if len(handles) == 2:
                     test_window = next(iter(set(handles) - {parent}))
-                elif handles[0] == parent and len(handles) > 2:
+                elif len(handles) > 2 and handles[0] == parent:
                     # Hope the first one here is the test window
                     test_window = handles[1]
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/chromium.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/chromium.py
index 569239018a2b..56435eabf4bb 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/chromium.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/chromium.py
@@ -114,6 +114,24 @@ def _map_status_name(self, status):
         # Any other status just gets returned as-is.
         return status
 
+    def _get_expected_status_from_data(self, actual_status, data):
+        """
+        Gets the expected status from a |data| dictionary.
+
+        If there is no expected status in data, the actual status is returned.
+        This is because mozlog will delete "expected" from |data| if it is the
+        same as "status". So the presence of "expected" implies that "status" is
+        unexpected. Conversely, the absence of "expected" implies the "status"
+        is expected. So we use the "expected" status if it's there or fall back
+        to the actual status if it's not.
+
+        :param str actual_status: the actual status of the test
+        :param data: a data dictionary to extract expected status from
+        :return str: the expected status
+        """
+        return (self._map_status_name(data["expected"])
+                if "expected" in data else actual_status)
+
     def suite_start(self, data):
         self.start_timestamp_seconds = (data["time"] if "time" in data
                                         else time.time())
@@ -122,13 +140,7 @@ def test_status(self, data):
         test_name = data["test"]
         is_unexpected = None
         actual_status = self._map_status_name(data["status"])
-        # mozlog will delete "expected" from |data| if it is the same as "status".
-        # So the presence of "expected" implies that "status" is unexpected.
-        # Conversely, the absence of "expected" implies the "status" is expected.
-        # So here we use the "expected" status if it's there or fall back to the
-        # actual status if it's not.
-        expected_status = (self._map_status_name(data["expected"])
-                           if "expected" in data else actual_status)
+        expected_status = self._get_expected_status_from_data(actual_status, data)
 
         is_unexpected = actual_status != expected_status
         if is_unexpected and test_name not in self.tests_with_subtest_fails:
@@ -139,8 +151,6 @@ def test_status(self, data):
                                       data["message"])
 
     def test_end(self, data):
-        expected_status = (self._map_status_name(data["expected"])
-                           if "expected" in data else "PASS")
         test_name = data["test"]
         actual_status = self._map_status_name(data["status"])
         if actual_status == "PASS" and test_name in self.tests_with_subtest_fails:
@@ -150,6 +160,7 @@ def test_end(self, data):
             # Clean up the test list to avoid accumulating too many.
             self.tests_with_subtest_fails.remove(test_name)
 
+        expected_status = self._get_expected_status_from_data(actual_status, data)
         if "message" in data:
             self._append_test_message(test_name, None, actual_status,
                                       expected_status, data["message"])
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py
index 9bb72d957f4d..83c128ac5cb4 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters/tests/test_chromium.py
@@ -214,7 +214,7 @@ def test_subtest_failure(capfd):
 
 
 def test_expected_subtest_failure(capfd):
-    # Tests that a expected subtest failure does not cause the test to fail
+    # Tests that an expected subtest failure does not cause the test to fail
 
     # Set up the handler.
     output = StringIO()
@@ -262,7 +262,7 @@ def test_expected_subtest_failure(capfd):
 
 
 def test_unexpected_subtest_pass(capfd):
-    # A test that unexpectedly passes is considered a failure condition.
+    # A subtest that unexpectedly passes is considered a failure condition.
 
     # Set up the handler.
     output = StringIO()
@@ -302,3 +302,71 @@ def test_unexpected_subtest_pass(capfd):
     assert test_obj["actual"] == "FAIL"
     # Also ensure that the formatter cleaned up its internal state
     assert "t1" not in formatter.tests_with_subtest_fails
+
+
+def test_expected_test_fail(capfd):
+    # Check that an expected test-level failure is treated as a Pass
+
+    # Set up the handler.
+    output = StringIO()
+    logger = structuredlog.StructuredLogger("test_a")
+    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
+
+    # Run some tests with different statuses: 3 passes, 1 timeout
+    logger.suite_start(["t1"], run_info={}, time=123)
+    logger.test_start("t1")
+    logger.test_end("t1", status="ERROR", expected="ERROR")
+    logger.suite_end()
+
+    # check nothing got output to stdout/stderr
+    # (note that mozlog outputs exceptions during handling to stderr!)
+    captured = capfd.readouterr()
+    assert captured.out == ""
+    assert captured.err == ""
+
+    # check the actual output of the formatter
+    output.seek(0)
+    output_json = json.load(output)
+
+    test_obj = output_json["tests"]["t1"]
+    # The test's actual and expected status should map from "ERROR" to "FAIL"
+    assert test_obj["actual"] == "FAIL"
+    assert test_obj["expected"] == "FAIL"
+    # ..and this test should not be a regression nor unexpected
+    assert "is_regression" not in test_obj
+    assert "is_unexpected" not in test_obj
+
+
+def test_unexpected_test_fail(capfd):
+    # Check that an unexpected test-level failure is marked as unexpected and
+    # as a regression.
+
+    # Set up the handler.
+    output = StringIO()
+    logger = structuredlog.StructuredLogger("test_a")
+    logger.add_handler(handlers.StreamHandler(output, ChromiumFormatter()))
+
+    # Run some tests with different statuses: 3 passes, 1 timeout
+    logger.suite_start(["t1"], run_info={}, time=123)
+    logger.test_start("t1")
+    logger.test_end("t1", status="ERROR", expected="OK")
+    logger.suite_end()
+
+    # check nothing got output to stdout/stderr
+    # (note that mozlog outputs exceptions during handling to stderr!)
+    captured = capfd.readouterr()
+    assert captured.out == ""
+    assert captured.err == ""
+
+    # check the actual output of the formatter
+    output.seek(0)
+    output_json = json.load(output)
+
+    test_obj = output_json["tests"]["t1"]
+    # The test's actual and expected status should be mapped, ERROR->FAIL and
+    # OK->PASS
+    assert test_obj["actual"] == "FAIL"
+    assert test_obj["expected"] == "PASS"
+    # ..and this test should not be a regression nor unexpected
+    assert test_obj["is_regression"] is True
+    assert test_obj["is_unexpected"] is True
diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedType-AttributeNodes.tentative.html b/tests/wpt/web-platform-tests/trusted-types/TrustedType-AttributeNodes.tentative.html
new file mode 100644
index 000000000000..77eef9cf39e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/TrustedType-AttributeNodes.tentative.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<meta http-equiv="Content-Security-Policy" content="trusted-types *">
+</head>
+<body>
+<script>
+  // This is a set of tests that try to make sure various ways of setting
+  // attributes (directly; via an attribute node; etc.) are all being treated
+  // identically. For background, se::
+  // https://github.com/w3c/webappsec-trusted-types/issues/47
+
+  const elems = ["div", "script", "embed", "iframe"];
+  const attrs = ["src", "srcdoc", "onclick", "bla"];
+
+  const policy_callback = s => ("" + s + " [policy]");
+  const policy = trustedTypes.createPolicy("policy", {
+    "createHTML": policy_callback,
+    "createScript": policy_callback,
+    "createScriptURL": policy_callback,
+  });
+
+  // Returns either the string-ified result value of fn, or an exception type.
+  function try_get(fn) {
+    try {
+      return "" + fn();
+    } catch(e) {
+      return "" + e.name;
+    }
+  }
+
+  // Returns a 'trusted' version of value, if element.attribute requires it.
+  function trusted(element, attribute, value) {
+    switch (trustedTypes.getAttributeType(element, attribute)) {
+      case 'TrustedHTML': value = policy.createHTML(value); break;
+      case 'TrustedScript': value = policy.createScript(value); break;
+      case 'TrustedScriptURL': value = policy.createScriptURL(value); break;
+    }
+    return value;
+  }
+
+  for (elem of elems) {
+    for (attr of attrs) {
+      const reference = try_get(_ => {
+        const e = document.createElement(elem);
+        e.setAttribute(attr, "hello");
+        return e.getAttribute(attr);
+      });
+
+      // Event handlers (like "onclick") apply to all elements, so we don't
+      // really have 'harmless' element we can attach them to. Hence this test
+      // case doesn't apply.
+      if (attr != "onclick") {
+        test(t => {
+          const harmless = document.createElement("div");
+          harmless.setAttribute(attr, "hello");
+          const node = harmless.getAttributeNode(attr);
+          harmless.removeAttributeNode(node);
+
+          const actual = try_get(_ => {
+            const e = document.createElement(elem);
+            e.setAttributeNode(node);
+            return e.getAttribute(attr);
+          });
+          assert_equals(actual, reference);
+        }, `Set attribute via attribute node on ${elem}.${attr}.`);
+      }
+
+      test(t => {
+        const e = document.createElement(elem);
+        e.setAttribute(attr, trusted(elem, attr, "123"));
+        const actual = try_get(_ => {
+          e.getAttributeNode(attr).value = "hello";
+          return e.getAttribute(attr);
+        });
+        assert_equals(actual, reference);
+      }, `Set attribute via attributenode.value on ${elem}.${attr}.`);
+
+      test(t => {
+        const e = document.createElement(elem);
+        const attrnode = document.createAttribute(attr);
+        attrnode.value = "hello";
+        const actual = try_get(_ => {
+          e.attributes.setNamedItem(attrnode);
+          return e.getAttribute(attr);
+        });
+        assert_equals(actual, reference);
+      }, `Set attribute via NamedNodeMap.setNamedItem on ${elem}.${attr}.`);
+    }
+  }
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html b/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html
new file mode 100644
index 000000000000..293444820216
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-unenforced.tentative.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js" ></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+  // This test tests error handling of duplicate policy creation when no
+  // Trusted Types enforcement is active.
+
+  test(t => {
+     trustedTypes.createPolicy('foo', {} );
+     trustedTypes.createPolicy('foo', {} );
+  }, "Duplicate policy names should be tolerated (unless in enforcing mode)");
+
+</script>
+</body>
+
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-createHTMLDocument.tentative.html b/tests/wpt/web-platform-tests/trusted-types/trusted-types-createHTMLDocument.tentative.html
index 7a43b1f7b35f..df094a8d5bcd 100644
--- a/tests/wpt/web-platform-tests/trusted-types/trusted-types-createHTMLDocument.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-createHTMLDocument.tentative.html
@@ -2,35 +2,69 @@
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-  <script src="/content-security-policy/support/testharness-helper.js"></script>
   <meta http-equiv="Content-Security-Policy" content="trusted-types *">
 </head>
 <body>
 <script>
 
-test(t => {
-  function try_assign(doc) {
-    doc.createElement("script").textContent = "2+2";
-  }
-  assert_throws(new TypeError(),
-                _ => try_assign(document),
-                "Trusted Type assignment throws in main document");
-  assert_throws(new TypeError(),
-                _ => try_assign(document.implementation.createHTMLDocument("")),
-                "Trusted Type assignment throws in created document");
-}, "Trusted Types work in createHTMLDocument");
-
-test(t => {
-  const policy = trustedTypes.createPolicy("policy", {createHTML: x => x });
-  const value = policy.createHTML("hello");
-  const doc = document.implementation.createHTMLDocument("");
-  doc.body.innerHTML = value;
-  assert_equals(doc.body.textContent, "hello");
-  assert_throws(new TypeError(),
-                _ => { doc.body.innerHTML = "world"; },
-                "Cannot assign text value.");
-  assert_equals(doc.body.textContent, "hello");
-}, "Trusted Type instances can be used in createHTMLDocument");
+// Test Trusted Types in document types other than the main document, such as
+// documents created by createHTMLDocument or XHR requests.
 
+function create_XHR_document() {
+  return new Promise(resolve => {
+    var xhr = new XMLHttpRequest();
+    xhr.onload = _ => { resolve(xhr.response); };
+    xhr.open("GET", 'data:text/html,<title>aaa</title>');
+    xhr.responseType = "document";
+    xhr.send();
+  });
+}
+
+const doc_types = {
+  "document": _ => document,
+  "createHTMLDocument": _ => document.implementation.createHTMLDocument(""),
+  "DOMParser": _ => (new DOMParser).parseFromString(trustedTypes.emptyHTML, "text/html"),
+  "XHR": create_XHR_document,
+}
+
+function doc_test(doc_type, test_fn, description) {
+  promise_test(t => {
+    return Promise.resolve(doc_types[doc_type]()).then(test_fn);
+  }, `${description} (${doc_type})`);
+}
+
+for (let doc_type in doc_types) {
+  doc_test(doc_type, doc => {
+    assert_throws(new TypeError(),
+                  _ => { doc.createElement("script").textContent = "2+2"; });
+  }, "Trusted Type assignment is blocked." );
+
+  doc_test(doc_type, doc => {
+    const policy = trustedTypes.createPolicy("policy", {createHTML: x => x });
+    const value = policy.createHTML("hello");
+    doc.body.innerHTML = value;
+    assert_equals(doc.body.textContent, "hello");
+    assert_throws(new TypeError(),
+                  _ => { doc.body.innerHTML = "world"; });
+  }, "Trusted Type instances created in the main doc can be used.");
+}
+
+// Create default policy (applies to all subsequent tests).
+// Wrapped in a promise_test so that it won't interfere with the previous tests
+// (which hanve't yet run).
+promise_test(t => {
+  return new Promise(resolve => {
+    trustedTypes.createPolicy("default",
+                              { createHTML: s => s + " [default]" });
+    resolve();
+  });
+}, "Install default policy.")
+
+for (let doc_type in doc_types) {
+  doc_test(doc_type, doc => {
+    doc.body.innerHTML = "shouldpass";
+    assert_equals(doc.body.textContent, "shouldpass [default]");
+  },  "Default policy applies.");
+}
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html.ini b/tests/wpt/web-platform-tests/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html.ini
deleted file mode 100644
index f8d682fbf902..000000000000
--- a/tests/wpt/web-platform-tests/visual-viewport/viewport-no-resize-event-on-overflow-recalc.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[viewport-no-resize-event-on-overflow-recalc.html]
-  expected: TIMEOUT
-  [Resize event not fired at window.visualViewport when content is added]
-    expected:
-      if (os == "android"): ["PASS", "NOTRUN"]
-      NOTRUN
diff --git a/tests/wpt/web-platform-tests/web-animations/animation-model/combining-effects/applying-interpolated-transform.html b/tests/wpt/web-platform-tests/web-animations/animation-model/combining-effects/applying-interpolated-transform.html
new file mode 100644
index 000000000000..c101b5f0cfcf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-animations/animation-model/combining-effects/applying-interpolated-transform.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title> apply interpolated transform on multiple keyframes</title>
+<link rel="help" href="https://drafts.csswg.org/web-animations/#keyframes-section">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../../testcommon.js"></script>
+<body>
+<div id="log"></div>
+<div id="target"></div>
+<script>
+'use strict';
+// This test tests the correctness if animation behavior under
+// box-size-denpendent and non-box-size-dependent transformation.
+test(t => {
+  var div_1 = createDiv(t);
+  div_1.style.width = "100px";
+  // Non-pairwise compatible transforms that are effectively no-ops with a
+  // matrix fallback. Both rotate(360deg) and scale(1) are identity matrix,
+  // making it easy to compute.
+  const keyframe1 = [
+      {"transform":"translateX( 200px ) rotate( 360deg )"},
+      {"transform":"translateX( 100% ) scale( 1 )"},
+    ];
+  const keyframe2 = [
+      {"transform":"translateX( 200px ) rotate( 360deg )"},
+      {"transform":"translateX( 100% ) scale( 1 )"},
+      {"transform":"none"},
+      {}
+    ];
+
+  const animation1 = div_1.animate(keyframe1, {
+                            "duration":3000,
+                            "easing":"linear",
+    });
+  const animation2 = div_1.animate(keyframe2, {
+                            "duration":3000,
+                            "easing":"linear",
+    });
+ // new animation on the second div, using px value instead of % as a reference
+
+  var div_2 = createDiv(t);
+  div_2.style.width = "100px";
+  const keyframe3 = [
+      {"transform":"translateX( 200px ) rotate( 360deg )"},
+      {"transform":"translateX( 100px ) scale( 1 )"},
+    ];
+  const keyframe4 = [
+      {"transform":"translateX( 200px ) rotate( 360deg )"},
+      {"transform":"translateX( 100px ) scale( 1 )"},
+      {"transform":"none"},
+      {}
+    ];
+
+  const animation3 = div_2.animate(keyframe1, {
+                            "duration":3000,
+                            "easing":"linear",
+    });
+  const animation4 = div_2.animate(keyframe2, {
+                            "duration":3000,
+                            "easing":"linear",
+                            "composite": 'replace',
+    });
+  animation1.pause();
+  animation2.pause();
+  animation3.pause();
+  animation4.pause();
+  var i;
+  for (i = 0; i <= 30; i++) {
+    animation2.currentTime = 100 * i;
+    animation4.currentTime = 100 * i;
+    var box_size_dependent_transform = getComputedStyle(div_1)['transform'];
+    var reference_transform = getComputedStyle(div_2)['transform']
+    var progress = i / 30;
+    // The second animation replaces the first animation. As the rotate and
+    // scale perations are effectively no-ops when the matrix fallback is
+    // applied. The expected behavior is to go from x-postion 200px to 0 in the
+    // first 2000ms and go back to x-position 200px in the last 1000ms.
+    var expected_transform = 'matrix(1, 0, 0, 1, $1, 0)'
+                            .replace('$1', Math.max(200 - 300 * progress, 0)
+                            + Math.max(0, -400 + 600 * progress));
+    assert_matrix_equals(box_size_dependent_transform, reference_transform);
+    assert_matrix_equals(reference_transform, expected_transform);
+  }
+})
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader-document-hidden-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFReader-document-hidden-manual.https.html
index 868cf1a968be..9cf42e83bf30 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFReader-document-hidden-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFReader-document-hidden-manual.https.html
@@ -9,15 +9,18 @@
 
 promise_test(async t => {
   const reader = new NDEFReader();
-  reader.scan();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-
-  return await new Promise((resolve, reject) => {
-    readerWatcher.wait_for("reading").then(event => {
-      if (document.hidden) reject();
-      resolve();
-    });
+  const promise = readerWatcher.wait_for("reading").then(event => {
+    if (document.hidden) reject();
+    resolve();
   });
+  if (window.testRunner) {
+    // Grant nfc permissions for Chromium testrunner.
+    window.testRunner.setPermission('nfc', 'granted',
+                                    location.origin, location.origin);
+  }
+  await reader.scan();
+  await promise;
 }, "Test NDEFReader.onreading is not fired when document is hidden");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader_options.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_options.https.html
index 81b051e28f47..6901e5cdcb25 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFReader_options.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_options.https.html
@@ -64,8 +64,8 @@
     {
       desc: "Test that the url of NDEFScanOptions filters relevant data" +
             " sources correctly.",
-      scanOptions: {url: `${location.origin}/custom/path`},
-      unmatchedScanOptions: {url: `${location.origin}/custom/invalid`},
+      scanOptions: {id: `${location.origin}/custom/path`},
+      unmatchedScanOptions: {id: `${location.origin}/custom/invalid`},
       message: {url: `${location.origin}/custom/path/update`,
           records: [createTextRecord(test_text_data)]}
     },
@@ -132,7 +132,7 @@
     {
       desc: "Test that filtering 'text' record from different messages" +
             " correctly with NDEFScanOptions' url set.",
-      scanOptions: {url: `${location.origin}/custom/path`},
+      scanOptions: {id: `${location.origin}/custom/path`},
       message: {url: `${location.origin}/custom/path/update`,
           records: [createTextRecord(test_text_data)]},
       unmatchedMessage: {url: `${location.origin}/custom/invalid`,
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan.https.html
index 7c78a1c60084..78160fbcb2ab 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan.https.html
@@ -22,59 +22,66 @@
 
 function waitSyntaxErrorPromise(t, scan_options) {
   const reader = new NDEFReader();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  const promise = readerWatcher.wait_for("error").then(event => {
-    assert_equals(event.error.name, 'SyntaxError');
-  });
-  // NDEFReader#scan() asynchronously dispatches the syntax error event.
-  reader.scan(scan_options);
-  return promise;
+  return promise_rejects(t, 'SyntaxError', reader.scan(scan_options));
 }
 
 promise_test(async t => {
-  await waitSyntaxErrorPromise(t, {url: "www.a.com"});
-}, "Test that NDEFReader.scan fails if NDEFScanOptions.url is missing \
+  const reader = new NDEFReader();
+  const promises = [];
+  invalid_signals.forEach(invalid_signal => {
+    promises.push(promise_rejects(t, new TypeError(),
+        reader.scan({ signal: invalid_signal })));
+  });
+  await Promise.all(promises);
+}, "Test that NDEFReader.scan rejects if signal is not an AbortSignal.");
+
+promise_test(async t => {
+  await waitSyntaxErrorPromise(t, {id: "www.a.com"});
+}, "Test that NDEFReader.scan rejects if NDEFScanOptions.id is missing \
 components.");
 
 promise_test(async t => {
-  await waitSyntaxErrorPromise(t, {url: "invalid"});
-}, "Test that NDEFReader.scan fails if NDEFScanOptions.url is invalid.");
+  await waitSyntaxErrorPromise(t, {id: "invalid"});
+}, "Test that NDEFReader.scan rejects if NDEFScanOptions.id is invalid.");
 
 promise_test(async t => {
-  await waitSyntaxErrorPromise(t, {url: "http://a.com"});
-}, "Test that NDEFReader.scan fails if NDEFScanOptions.url has wrong \
+  await waitSyntaxErrorPromise(t, {id: "http://a.com"});
+}, "Test that NDEFReader.scan rejects if NDEFScanOptions.id has wrong \
 protocol.");
 
-nfc_test(async (t, mockNFC) => {
+promise_test(async t => {
+  if (window.testRunner) {
+    // Deny nfc permissions for Chromium testrunner.
+    window.testRunner.setPermission('nfc', 'denied',
+                                    location.origin, location.origin);
+  }
   const reader = new NDEFReader();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  reader.scan();
+  await promise_rejects(t, 'NotAllowedError', reader.scan());
+}, "NDEFReader.scan should fail if user permission is not granted.");
+
+nfc_test(async (t, mockNFC) => {
   mockNFC.setHWStatus(NFCHWStatus.DISABLED);
-  const event = await readerWatcher.wait_for("error");
-  assert_equals(event.error.name, 'NotReadableError');
+  const reader = new NDEFReader();
+  await promise_rejects(t, 'NotReadableError', reader.scan());
 }, "NDEFReader.scan should fail if NFC HW is disabled.");
 
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  reader.scan();
   mockNFC.setHWStatus(NFCHWStatus.NOT_SUPPORTED);
-  const event = await readerWatcher.wait_for("error");
-  assert_equals(event.error.name, 'NotSupportedError');
+  const reader = new NDEFReader();
+  await promise_rejects(t, 'NotSupportedError', reader.scan());
 }, "NDEFReader.scan should fail if NFC HW is not supported.");
 
 nfc_test(async (t, mockNFC) => {
   const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-
-  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   const promise = readerWatcher.wait_for("reading").then(event => {
     assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  // NDEFReader#scan() asynchronously dispatches the reading event.
-  reader.scan({signal : controller.signal});
+  await reader.scan({signal : controller.signal});
+
+  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   await promise;
 }, "Test that nfc watch success if NFC HW is enabled.");
 
@@ -82,14 +89,13 @@
   const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-
-  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   const promise = readerWatcher.wait_for("reading").then(event => {
     assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  // NDEFReader#scan() asynchronously dispatches the reading event.
-  reader.scan({signal : controller.signal, url: "https://a.com"});
+  await reader.scan({signal : controller.signal, url: "https://a.com"});
+
+  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   await promise;
 }, "Test that NDEFReader.scan succeeds if NDEFScanOptions.url is valid URL.");
 
@@ -97,14 +103,13 @@
   const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-
-  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   const promise = readerWatcher.wait_for("reading").then(event => {
     assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  // NDEFReader#scan() asynchronously dispatches the reading event.
-  reader.scan({signal : controller.signal, url: "https://a.com/*"});
+  await reader.scan({signal : controller.signal, url: "https://a.com/*"});
+
+  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   await promise;
 }, "Test that NDEFReader.scan succeeds if NDEFScanOptions.url is valid URL \
 with '*' wildcard character in path.");
@@ -113,14 +118,13 @@
   const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-
-  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   const promise = readerWatcher.wait_for("reading").then(event => {
     assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  // NDEFReader#scan() asynchronously dispatches the reading event.
-  reader.scan({signal : controller.signal, url: "https://a.com/*/bar"});
+  await reader.scan({signal : controller.signal, url: "https://a.com/*/bar"});
+
+  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   await promise;
 }, "Test that NDEFReader.scan succeeds if NDEFScanOptions.url is valid URL \
 with '*' wildcard character in the beginning of path component followed by \
@@ -130,102 +134,90 @@
   const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-
-  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   const promise = readerWatcher.wait_for("reading").then(event => {
     assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  // NDEFReader#scan() asynchronously dispatches the reading event.
-  reader.scan({signal : controller.signal, url: ""});
+  await reader.scan({signal : controller.signal, url: ""});
+
+  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   await promise;
 }, "Test that NDEFReader.scan succeeds if NDEFScanOptions.url is empty.");
 
 nfc_test(async (t, mockNFC) => {
   const reader = new NDEFReader();
-  const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
-
   const controller = new AbortController();
   controller.abort();
-  reader.scan({signal: controller.signal});
+  await promise_rejects(t, 'AbortError', reader.scan({signal: controller.signal}));
+}, "Test that NDEFReader.scan rejects if NDEFScanOptions.signal is already aborted.");
 
-  await new Promise((resolve, reject) => {
-    readerWatcher.wait_for("reading").then(event => {
-      reject("reading event should not be fired.");
-    });
-    t.step_timeout(resolve, 100);
-  });
-
-}, "Test that NDEFReader.onreading should not be fired if NDEFScanOptions.signal \
-is aborted.");
+nfc_test(async (t, mockNFC) => {
+  const reader = new NDEFReader();
+  const controller = new AbortController();
+  const promise = reader.scan({signal: controller.signal});
+  controller.abort();
+  await promise_rejects(t, 'AbortError', promise);
+}, "Test that NDEFReader.scan rejects if NDEFScanOptions.signal aborts right after \
+the scan invocation.");
 
 nfc_test(async (t, mockNFC) => {
   const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
   const message = createMessage([createTextRecord(test_text_data)]);
+  const promise = readerWatcher.wait_for("reading").then(event => {
+    assert_true(event instanceof NDEFReadingEvent);
+  });
+  await reader.scan({signal : controller.signal});
 
   mockNFC.setReadingMessage(message);
+  await promise;
 
-  reader.scan({signal: controller.signal});
-  const event = await readerWatcher.wait_for("reading");
-  assert_true(event instanceof NDEFReadingEvent);
+  reader.onreading = t.unreached_func("reading event should not be fired.");
   mockNFC.setReadingMessage(message);
   controller.abort();
-
   await new Promise((resolve, reject) => {
-    readerWatcher.wait_for("reading").then(event => {
-      reject("reading event should not be fired.");
-    });
     t.step_timeout(resolve, 100);
   });
-
-}, "Synchronously signaled abort.");
+}, "Test that NDEFReader can not get any reading events once the signal aborts.");
 
 nfc_test(async (t, mockNFC) => {
   const reader = new NDEFReader();
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
+  const promise = readerWatcher.wait_for("reading").then(event => {
+    controller.abort();
+    assert_true(event instanceof NDEFReadingEvent);
+    // The message contains only an external type record.
+    assert_equals(event.message.records.length, 1);
+    assert_equals(event.message.records[0].recordType, 'example.com:payloadIsMessage', 'recordType');
+    // The external type record's payload is a message, which contains only a text record.
+    const embeddedRecords = event.message.records[0].toRecords();
+    assert_equals(embeddedRecords.length, 1);
+    assert_equals(embeddedRecords[0].recordType, 'text', 'recordType');
+    assert_equals(embeddedRecords[0].mediaType, null, 'mediaType');
+    const decoder = new TextDecoder();
+    assert_equals(decoder.decode(embeddedRecords[0].data), test_text_data,
+                    'data has the same content with the original dictionary');
+  });
+  await reader.scan({signal : controller.signal});
 
   const payloadMessage = createMessage([createTextRecord(test_text_data)]);
   const message = createMessage([createRecord('example.com:payloadIsMessage',
           payloadMessage)]);
   mockNFC.setReadingMessage(message);
-
-  reader.scan({signal : controller.signal});
-  const event = await readerWatcher.wait_for("reading");
-  controller.abort();
-  assert_true(event instanceof NDEFReadingEvent);
-  // The message contains only an external type record.
-  assert_equals(event.message.records.length, 1);
-  assert_equals(event.message.records[0].recordType, 'example.com:payloadIsMessage', 'recordType');
-  // The external type record's payload is a message, which contains only a text record.
-  const embeddedRecords = event.message.records[0].toRecords();
-  assert_equals(embeddedRecords.length, 1);
-  assert_equals(embeddedRecords[0].recordType, 'text', 'recordType');
-  assert_equals(embeddedRecords[0].mediaType, null, 'mediaType');
-  const decoder = new TextDecoder();
-  assert_equals(decoder.decode(embeddedRecords[0].data), test_text_data,
-                  'data has the same content with the original dictionary');
+  await promise;
 }, "NDEFRecord.toRecords returns its embedded records correctly.");
 
-test(() => {
-  const reader = new NDEFReader();
-  invalid_signals.forEach(invalid_signal => {
-    assert_throws(new TypeError(),
-        () => { reader.scan({ signal: invalid_signal }); });
-  });
-}, "NDEFReader.scan should fail if signal is not an AbortSignal.");
-
 nfc_test(async (t, mockNFC) => {
-  const reader = new NDEFReader();
   mockNFC.setIsNDEFTech(false);
-  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
 
+  const reader = new NDEFReader();
+  reader.onreading = t.unreached_func("reading event should not be fired.");
+  await reader.scan();
+
+  mockNFC.setReadingMessage(createMessage([createTextRecord(test_text_data)]));
   await new Promise((resolve, reject) => {
-    reader.onreading = () => reject("reading event should not be fired.");
-    reader.scan();
     t.step_timeout(resolve, 100);
   });
 }, "Test that NDEFReader.onreading should not be fired if the NFC tag does not \
@@ -234,16 +226,15 @@
 nfc_test(async (t, mockNFC) => {
   const reader = new NDEFReader();
   const controller = new AbortController();
-  mockNFC.setReadingMessage({ records: [] });
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-
   const promise = readerWatcher.wait_for("reading").then(event => {
     assert_equals(event.serialNumber, fake_tag_serial_number);
     assert_equals(event.message.records.length, 0);
     controller.abort();
   });
-  // NDEFReader#scan() asynchronously dispatches the reading event.
-  reader.scan({signal : controller.signal});
+  await reader.scan({signal : controller.signal});
+
+  mockNFC.setReadingMessage({ records: [] });
   await promise;
 }, "Test that NDEFReader.onreading should be fired on an unformatted NFC tag \
 with empty records array for NDEFMessage.");
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan_iframe.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan_iframe.https.html
index e9720e98ef65..9bdb07136821 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan_iframe.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFReader_scan_iframe.https.html
@@ -17,7 +17,7 @@
     assert_true(event instanceof NDEFReadingEvent);
     controller.abort();
   });
-  reader.scan({ signal: controller.signal });
+  await reader.scan({ signal: controller.signal });
 
   const iframe = document.createElement('iframe');
   iframe.src = 'resources/support-iframe.html';
@@ -40,4 +40,4 @@
 }, 'Test that NDEFWriter.scan is not suspended if iframe gains focus.');
 
 </script>
-</body>
\ No newline at end of file
+</body>
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
index 79ce8a076eda..ea7b5e495086 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
@@ -46,6 +46,8 @@
     const decoder = new TextDecoder();
     assert_equals(decoder.decode(record.data), test_text_data,
         'data has the same content with the original dictionary');
+    assert_throws('NotSupportedError', () => record.toRecords(),
+        'Only smart-poster records and external type records could have embedded records.');
   }, 'NDEFRecord constructor with text record type and string data');
 
   test(() => {
@@ -59,6 +61,8 @@
     const decoder = new TextDecoder();
     assert_equals(decoder.decode(record.data), test_text_data,
         'data has the same content with the original dictionary');
+    assert_throws('NotSupportedError', () => record.toRecords(),
+        'Only smart-poster records and external type records could have embedded records.');
   }, 'NDEFRecord constructor with text record type and arrayBuffer data');
 
   test(() => {
@@ -72,6 +76,8 @@
     const decoder = new TextDecoder();
     assert_equals(decoder.decode(record.data), test_text_data,
         'data has the same content with the original dictionary');
+    assert_throws('NotSupportedError', () => record.toRecords(),
+        'Only smart-poster records and external type records could have embedded records.');
   }, 'NDEFRecord constructor with text record type and arrayBufferView data');
 
   test(() => {
@@ -113,6 +119,8 @@
     const decoder = new TextDecoder();
     assert_equals(decoder.decode(record.data), test_url_data,
         'data has the same content with the original dictionary');
+    assert_throws('NotSupportedError', () => record.toRecords(),
+        'Only smart-poster records and external type records could have embedded records.');
   }, 'NDEFRecord constructor with url record type');
 
   test(() => {
@@ -122,6 +130,8 @@
     const decoder = new TextDecoder();
     assert_equals(decoder.decode(record.data), test_url_data,
         'data has the same content with the original dictionary');
+    assert_throws('NotSupportedError', () => record.toRecords(),
+        'Only smart-poster records and external type records could have embedded records.');
   }, 'NDEFRecord constructor with absolute-url record type');
 
   test(() => {
@@ -138,6 +148,8 @@
       assert_equals(record.mediaType, 'application/octet-stream', 'mediaType');
       assert_array_equals(new Uint8Array(record.data.buffer), [1, 2, 3, 4],
           'data has the same content with the original buffer');
+      assert_throws('NotSupportedError', () => record.toRecords(),
+          'Only smart-poster records and external type records could have embedded records.');
     }
     // Feed ArrayBufferView.
     {
@@ -146,6 +158,8 @@
       assert_equals(record.recordType, 'mime', 'recordType');
       assert_array_equals(new Uint8Array(record.data.buffer), [2, 3, 4],
           'data has the same content with the original buffer view');
+      assert_throws('NotSupportedError', () => record.toRecords(),
+          'Only smart-poster records and external type records could have embedded records.');
     }
   }, 'NDEFRecord constructor with mime record type and stream data');
 
@@ -156,6 +170,8 @@
     assert_object_equals(JSON.parse(new TextDecoder().decode(record.data)),
         test_json_data,
         'data has the same content with the original json');
+    assert_throws('NotSupportedError', () => record.toRecords(),
+        'Only smart-poster records and external type records could have embedded records.');
   }, 'NDEFRecord constructor with mime record type and json data');
 
   test(() => {
@@ -171,6 +187,8 @@
       assert_equals(record.recordType, 'unknown', 'recordType');
       assert_array_equals(new Uint8Array(record.data.buffer), [1, 2, 3, 4],
           'data has the same content with the original buffer');
+      assert_throws('NotSupportedError', () => record.toRecords(),
+          'Only smart-poster records and external type records could have embedded records.');
     }
     // Feed ArrayBufferView.
     {
@@ -179,19 +197,39 @@
       assert_equals(record.recordType, 'unknown', 'recordType');
       assert_array_equals(new Uint8Array(record.data.buffer), [2, 3, 4],
           'data has the same content with the original buffer view');
+      assert_throws('NotSupportedError', () => record.toRecords(),
+          'Only smart-poster records and external type records could have embedded records.');
     }
   }, 'NDEFRecord constructor with unknown record type');
 
   test(() => {
+    assert_throws(new TypeError, () => new NDEFRecord(
+        createRecord('foo.eXamPle.coM:bAr*-', "A string is not a BufferSource or NDEFMessage")),
+        'Only BufferSource and NDEFMessage are allowed to be the record data.');
+
     let buffer = new ArrayBuffer(4);
-    let buffer_view = new Uint8Array(buffer);
-    let original_data = new Uint8Array([1, 2, 3, 4]);
-    buffer_view.set(original_data);
-    const record = new NDEFRecord(createRecord('foo.eXamPle.coM:bAr*-', buffer));
-    assert_equals(record.recordType, 'foo.example.com:bAr*-', 'recordType');
-    assert_equals(record.mediaType, null, 'mediaType');
-    assert_array_equals(new Uint8Array(record.data.buffer), original_data,
-        'data has the same content with the original buffer');
+    new Uint8Array(buffer).set([1, 2, 3, 4]);
+    // Feed ArrayBuffer.
+    {
+      const record = new NDEFRecord(createRecord('foo.eXamPle.coM:bAr*-', buffer));
+      assert_equals(record.recordType, 'foo.example.com:bAr*-', 'recordType');
+      assert_equals(record.mediaType, null, 'mediaType');
+      assert_array_equals(new Uint8Array(record.data.buffer), [1, 2, 3, 4],
+          'data has the same content with the original buffer');
+      assert_equals(record.toRecords(), null,
+          'toRecords() returns null if the payload is not an NDEF message.');
+    }
+    // Feed ArrayBufferView.
+    {
+      let buffer_view = new Uint8Array(buffer, 1);
+      const record = new NDEFRecord(createRecord('foo.eXamPle.coM:bAr*-', buffer_view));
+      assert_equals(record.recordType, 'foo.example.com:bAr*-', 'recordType');
+      assert_equals(record.mediaType, null, 'mediaType');
+      assert_array_equals(new Uint8Array(record.data.buffer), [2, 3, 4],
+          'data has the same content with the original buffer view');
+      assert_equals(record.toRecords(), null,
+          'toRecords() returns null if the payload is not an NDEF message.');
+    }
   }, 'NDEFRecord constructor with external record type');
 
   test(() => {
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_push.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_push.https.html
index 6ac940f64b0e..6c7aca9fe938 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_push.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFWriter_push.https.html
@@ -83,7 +83,7 @@
       createMessage([createRecord('w3.org:xyz', test_number_data)]),
       createMessage([createRecord('w3.org:xyz', test_json_data)]),
 
-      // https://w3c.github.io/web-nfc/#the-ndefrecordtype-string
+      // https://w3c.github.io/web-nfc/#ndef-record-types
       // The record type is neither a known type ('text', 'mime' etc.) nor a
       // valid custom type for an external type record.
       createMessage([createRecord('unmatched_type', test_buffer_data)])
@@ -127,6 +127,16 @@
 }, "Test that promise is rejected with SyntaxError if NDEFMessageSource contains\
  invalid records.");
 
+ promise_test(async t => {
+  if (window.testRunner) {
+    // Deny nfc permissions for Chromium testrunner.
+    window.testRunner.setPermission('nfc', 'denied',
+                                    location.origin, location.origin);
+  }
+  const writer = new NDEFWriter();
+  await promise_rejects(t, 'NotAllowedError', writer.push(test_text_data));
+}, 'NDEFWriter.push should fail if user permission is not granted.');
+
 nfc_test(async (t, mockNFC) => {
   const writer = new NDEFWriter();
   const controller = new AbortController();
@@ -171,7 +181,6 @@
   const writer1 = new NDEFWriter();
   const writer2 = new NDEFWriter();
   const controller = new AbortController();
-  mockNFC.setPendingPushCompleted(false);
   const p1 = writer1.push(test_text_data, { signal: controller.signal });
 
   // Even though push request is grantable,
@@ -220,6 +229,11 @@
   await new Promise((resolve,reject) => {
     const iframe = document.createElement('iframe');
     iframe.srcdoc = `<script>
+                      if (window.testRunner) {
+                        // Grant nfc permissions for Chromium testrunner.
+                        window.testRunner.setPermission('nfc', 'granted',
+                                                        location.origin, location.origin);
+                      }
                       window.onmessage = message => {
                         if (message.data === "Ready") {
                           const onSuccess = () => {
@@ -316,18 +330,18 @@
   const message = createMessage([createTextRecord(test_text_data)]);
   const controller = new AbortController();
   const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-  const promise = readerWatcher.wait_for("reading").then(event => {
-    controller.abort();
-    assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
-  });
-
-  reader.scan({ signal: controller.signal });
+  await reader.scan({ signal: controller.signal });
 
   const writer = new NDEFWriter();
   await writer.push(test_text_data, { ignoreRead: false });
-  mockNFC.setReadingMessage(message);
   assertNDEFMessagesEqual(test_text_data, mockNFC.pushedMessage());
-  await promise;
+
+  mockNFC.setReadingMessage(message);
+  await readerWatcher.wait_for("reading").then(event => {
+    controller.abort();
+    assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
+  });
+
 }, "NDEFWriter.push should read data when ignoreRead is false.");
 
 nfc_test(async (t, mockNFC) => {
@@ -335,7 +349,7 @@
   const message = createMessage([createTextRecord(test_text_data)]);
   // Ignore reading if NDEFPushOptions.ignoreRead is true
   reader.onreading = t.unreached_func("reading event should not be fired.");
-  reader.scan();
+  await reader.scan();
 
   const writer = new NDEFWriter();
   await writer.push(test_text_data, { ignoreRead: true });
diff --git a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
index e7be49e43377..eb3006114c7c 100644
--- a/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
+++ b/tests/wpt/web-platform-tests/web-nfc/resources/nfc-helpers.js
@@ -37,9 +37,8 @@ async function initialize_nfc_tests() {
     await loadChromiumResources;
   }
   assert_true(
-    typeof WebNFCTest !== 'undefined',
-    'WebNFC testing interface is not available.'
-  );
+      typeof WebNFCTest !== 'undefined',
+      'WebNFC testing interface is not available.');
   let NFCTest = new WebNFCTest();
   await NFCTest.initialize();
   return NFCTest;
@@ -48,12 +47,10 @@ async function initialize_nfc_tests() {
 function nfc_test(func, name, properties) {
   promise_test(async t => {
     let NFCTest = await initialize_nfc_tests();
-    let mockTest = NFCTest.getMockNFC();
-    try {
-      await func(t, mockTest);
-    } finally {
+    t.add_cleanup(async () => {
       await NFCTest.reset();
-    };
+    });
+    await func(t, NFCTest.getMockNFC());
   }, name, properties);
 }
 
@@ -177,22 +174,20 @@ function testNDEFScanOptions(message, scanOptions, unmatchedScanOptions, desc) {
     const reader2 = new NDEFReader();
     const controller = new AbortController();
 
-    mockNFC.setReadingMessage(message);
-
     // Reading from unmatched reader will not be triggered
     reader1.onreading = t.unreached_func("reading event should not be fired.");
     unmatchedScanOptions.signal = controller.signal;
-    reader1.scan(unmatchedScanOptions);
+    await reader1.scan(unmatchedScanOptions);
 
     const readerWatcher = new EventWatcher(t, reader2, ["reading", "error"]);
-
     const promise = readerWatcher.wait_for("reading").then(event => {
       controller.abort();
       assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
     });
-    // NDEFReader#scan() asynchronously dispatches the onreading event.
     scanOptions.signal = controller.signal;
-    reader2.scan(scanOptions);
+    await reader2.scan(scanOptions);
+
+    mockNFC.setReadingMessage(message);
     await promise;
   }, desc);
 }
@@ -203,19 +198,16 @@ function testReadingMultiMessages(
     const reader = new NDEFReader();
     const controller = new AbortController();
     const readerWatcher = new EventWatcher(t, reader, ["reading", "error"]);
-
     const promise = readerWatcher.wait_for("reading").then(event => {
       controller.abort();
       assertWebNDEFMessagesEqual(event.message, new NDEFMessage(message));
     });
-    // NDEFReader#scan() asynchronously dispatches the onreading event.
     scanOptions.signal = controller.signal;
-    reader.scan(scanOptions);
+    await reader.scan(scanOptions);
 
     // Unmatched message will not be read
     mockNFC.setReadingMessage(unmatchedMessage);
     mockNFC.setReadingMessage(message);
-
     await promise;
   }, desc);
 }
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/cycle-without-delay.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/cycle-without-delay.html
new file mode 100644
index 000000000000..cab0f6ca8e7f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/cycle-without-delay.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html class="a">
+  <head>
+    <title>Cycles without DelayNode in audio node graph</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      function doTest() {
+        var off = new OfflineAudioContext(1, 512, 48000);
+        var osc = new OscillatorNode(off);
+        var fb = new GainNode(off);
+        // zero delay feedback loop
+        osc.connect(fb).connect(fb).connect(off.destination);
+        osc.start(0);
+        return off.startRendering().then((b) => {
+          return Promise.resolve(b.getChannelData(0));
+        });
+      }
+
+      promise_test(() => {
+        return doTest().then(samples => {
+          var silent = true;
+          for (var i = 0; i < samples.length; i++) {
+            if (samples[i] != 0.0) {
+              silent = false;
+              break;
+            }
+          }
+          assert_true(silent);
+        });
+      }, 'Test that cycles that don\'t contain a DelayNode are muted');
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/cycle-witout-delay.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/cycle-witout-delay.html
deleted file mode 100644
index ed26ad2ced2c..000000000000
--- a/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/cycle-witout-delay.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html class="a">
-  <head>
-    <title>Cycles without DelayNode in audio node graph</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      const t = async_test(
-        "Test that cycles that don't contain a DelayNode are muted"
-      );
-      t.step(function() {
-          var off = new OfflineAudioContext(1, 512, 48000);
-          var osc = new OscillatorNode(off);
-          var fb = new GainNode(off);
-          // zero delay feedback loop
-          osc.connect(fb).connect(fb).connect(off.destination);
-          osc.start(0);
-          off.startRendering().then((b) => {
-              var samples = b.getChannelData(0);
-              var silent = true;
-              for (var i = 0; i < samples.length; i++) {
-                if (samples[i] != 0.0) {
-                  silent = false;
-                  break;
-                }
-              }
-              assert_true(silent);
-              t.done();
-          });
-      });
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/delay-time-clamping.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/delay-time-clamping.html
index 3f8ed24429a7..b79f0de0e587 100644
--- a/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/delay-time-clamping.html
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/delay-time-clamping.html
@@ -7,32 +7,37 @@
   </head>
   <body>
     <script>
-      const t = async_test(
-        "Test that a DelayNode allows a feedback loop of a single rendering quantum"
-      );
-      t.step(function() {
-          var off = new OfflineAudioContext(1, 512, 48000);
-          var b = off.createBuffer(1, 1, 48000);
-          b.getChannelData(0)[0] = 1;
-          var impulse = new AudioBufferSourceNode(off, {buffer: b});
-          impulse.start(0);
-          // This delayTime of 64 samples MUST be clamped to 128 samples when
-          // in a cycle.
-          var delay = new DelayNode(off, {delayTime: 64/48000});
-          var fb = new GainNode(off);
-          impulse.connect(fb).connect(delay).connect(fb).connect(off.destination);
-          off.startRendering().then((b) => {
-              var samples = b.getChannelData(0);
-              for (var i = 0; i < samples.length; i++) {
-                if ((i % 128) != 0) {
-                  assert_equals(samples[i], 0.0, "Non-silent audio found in between delayed impulses");
-                } else {
-                  assert_equals(samples[i], 1.0, "Silent audio found instead of a delayed impulse");
-                }
-              }
-              t.done();
-          });
-      });
+      function doTest() {
+        let off = new OfflineAudioContext(1, 512, 48000);
+        let b = new Audiobuffer({sampleRate: off.sampleRate, length: 1});
+        b.getChannelData(0)[0] = 1;
+        let impulse = new AudioBufferSourceNode(off, {buffer: b});
+        impulse.start(0);
+        // This delayTime of 64 samples MUST be clamped to 128 samples when
+        // in a cycle.
+        let delay = new DelayNode(off, {delayTime: 64 / 48000});
+        let fb = new GainNode(off);
+        impulse.connect(fb).connect(delay).connect(fb).connect(off.destination);
+        return off.startRendering().then((b) => {
+          return Promise.resolve(b.getChannelData(0));
+        })
+      }
+
+      promise_test(() => {
+        return doTest().then(samples => {
+          for (var i = 0; i < samples.length; i++) {
+            if ((i % 128) != 0) {
+              assert_equals(
+                  samples[i], 0.0,
+                  'Non-silent audio found in between delayed impulses');
+            } else {
+              assert_equals(
+                  samples[i], 1.0,
+                  'Silent audio found instead of a delayed impulse');
+            }
+          }
+        });
+      }, 'Test that a DelayNode allows a feedback loop of a single rendering quantum');
     </script>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/feedback-delay-time.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/feedback-delay-time.html
index 50c8e455b908..96c2eb065866 100644
--- a/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/feedback-delay-time.html
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/processing-model/feedback-delay-time.html
@@ -7,30 +7,36 @@
   </head>
   <body>
     <script>
-      const t = async_test(
-        "Test that a DelayNode allows a feedback loop of a single rendering quantum"
-      );
-      t.step(function() {
-          var off = new OfflineAudioContext(1, 512, 48000);
-          var b = off.createBuffer(1, 1, 48000);
-          b.getChannelData(0)[0] = 1;
-          var impulse = new AudioBufferSourceNode(off, {buffer: b});
-          impulse.start(0);
-          var delay = new DelayNode(off, {delayTime: 128/48000});
-          var fb = new GainNode(off);
-          impulse.connect(fb).connect(delay).connect(fb).connect(off.destination);
-          off.startRendering().then((b) => {
-              var samples = b.getChannelData(0);
-              for (var i = 0; i < samples.length; i++) {
-                if ((i % 128) != 0) {
-                  assert_equals(samples[i], 0.0, "Non-silent audio found in between delayed impulses");
-                } else {
-                  assert_equals(samples[i], 1.0, "Silent audio found instead of a delayed impulse");
-                }
-              }
-              t.done();
-          });
-      });
+      function doTest() {
+        var off = new OfflineAudioContext(1, 512, 48000);
+        var b = off.createBuffer(1, 1, 48000);
+        b.getChannelData(0)[0] = 1;
+        var impulse = new AudioBufferSourceNode(off, {buffer: b});
+        impulse.start(0);
+        var delay = new DelayNode(off, {delayTime: 128 / 48000});
+        var fb = new GainNode(off);
+        impulse.connect(fb).connect(delay).connect(fb).connect(off.destination);
+        var samples;
+        return off.startRendering().then((b) => {
+          return Promise.resolve(b.getChannelData(0));
+        });
+      }
+
+      promise_test(() => {
+        return doTest().then(samples => {
+          for (var i = 0; i < samples.length; i++) {
+            if ((i % 128) != 0) {
+              assert_equals(
+                  samples[i], 0.0,
+                  'Non-silent audio found in between delayed impulses');
+            } else {
+              assert_equals(
+                  samples[i], 1.0,
+                  'Silent audio found instead of a delayed impulse');
+            }
+          }
+        });
+      }, 'Test that a DelayNode allows a feedback loop of a single rendering quantum');
     </script>
   </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-destinationnode-interface/destination.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-destinationnode-interface/destination.html
new file mode 100644
index 000000000000..cda5668a09b6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-destinationnode-interface/destination.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      AudioDestinationNode
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      function assert_doesnt_throw(f, desc) {
+        try {
+          f();
+        } catch (e) {
+          assert_true(false, desc);
+          return;
+        }
+        assert_true(true, desc);
+      }
+
+      test(function() {
+          var ac = new AudioContext();
+
+          assert_equals(ac.destination.channelCount, 2,
+              "A DestinationNode should have two channels by default");
+
+          assert_greater_than_equal(ac.destination.maxChannelCount, 2,
+            "maxChannelCount should be >= 2");
+
+          assert_throws("IndexSizeError", function() {
+              ac.destination.channelCount = ac.destination.maxChannelCount + 1
+              }, `Setting the channelCount to something greater than
+                  the maxChannelCount should throw IndexSizeError`);
+
+          assert_throws("NotSupportedError", function() {
+              ac.destination.channelCount = 0;
+          }, "Setting the channelCount to 0 should throw NotSupportedError");
+
+          assert_doesnt_throw(function() {
+              ac.destination.channelCount = ac.destination.maxChannelCount;
+          }, "Setting the channelCount to maxChannelCount should not throw");
+
+          assert_doesnt_throw(function() {
+              ac.destination.channelCount = 1;
+          }, "Setting the channelCount to 1 should not throw");
+      });
+
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/keys.py b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/keys.py
index d30ee91b5a61..d4072f5a3f33 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/keys.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/keys.py
@@ -379,7 +379,7 @@ class Keys(object):
         "value": u"\ue012",
     },
     "META": {
-        "code": "OSLeft",
+        "code": "MetaLeft",
         "ctrl": False,
         "key": "Meta",
         "location": 1,
@@ -631,7 +631,7 @@ class Keys(object):
         "value": u"\ue05c",
     },
     "R_META": {
-        "code": "OSRight",
+        "code": "MetaRight",
         "ctrl": False,
         "key": "Meta",
         "location": 2,
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/basic.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/basic.spec.js
index c4333c794d2d..6762a563c56e 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/basic.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/basic.spec.js
@@ -11,6 +11,6 @@ export const g = new TestGroup(GPUTest);
 g.test('empty', async t => {
   const encoder = t.device.createCommandEncoder();
   const cmd = encoder.finish();
-  t.device.getQueue().submit([cmd]); // TODO: test that submit() succeeded.
+  t.device.defaultQueue.submit([cmd]); // TODO: test that submit() succeeded.
 });
 //# sourceMappingURL=basic.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js
index 8a5fc168a4d8..7abb291ca43e 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js
@@ -84,7 +84,7 @@ g.test('memcpy', async t => {
   pass.setBindGroup(0, bg);
   pass.dispatch(1, 1, 1);
   pass.endPass();
-  t.device.getQueue().submit([encoder.finish()]);
+  t.device.defaultQueue.submit([encoder.finish()]);
   t.expectContents(dst, data);
 });
 //# sourceMappingURL=basic.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/copies.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/copies.spec.js
index a93a1b2cbdf3..c5bae2ada80e 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/copies.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/copies.spec.js
@@ -22,7 +22,7 @@ g.test('b2b', async t => {
   });
   const encoder = t.device.createCommandEncoder();
   encoder.copyBufferToBuffer(src, 0, dst, 0, 4);
-  t.device.getQueue().submit([encoder.finish()]);
+  t.device.defaultQueue.submit([encoder.finish()]);
   t.expectContents(dst, data);
 });
 g.test('b2t2b', async t => {
@@ -81,7 +81,7 @@ g.test('b2t2b', async t => {
     height: 1,
     depth: 1
   });
-  t.device.getQueue().submit([encoder.finish()]);
+  t.device.defaultQueue.submit([encoder.finish()]);
   t.expectContents(dst, data);
 });
 g.test('b2t2t2b', async t => {
@@ -163,7 +163,7 @@ g.test('b2t2t2b', async t => {
     height: 1,
     depth: 1
   });
-  t.device.getQueue().submit([encoder.finish()]);
+  t.device.defaultQueue.submit([encoder.finish()]);
   t.expectContents(dst, data);
 });
 //# sourceMappingURL=copies.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/basic.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/basic.spec.js
index 89bbdd8a6398..46b5c7a27c9b 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/basic.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/basic.spec.js
@@ -54,7 +54,7 @@ g.test('clear', async t => {
     height: 1,
     depth: 1
   });
-  t.device.getQueue().submit([encoder.finish()]);
+  t.device.defaultQueue.submit([encoder.finish()]);
   t.expectContents(dst, new Uint8Array([0x00, 0xff, 0x00, 0xff]));
 });
 //# sourceMappingURL=basic.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js
index 54c627dfd35d..a5d7568dae59 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js
@@ -111,7 +111,7 @@ g.test('fullscreen quad', async t => {
     height: 1,
     depth: 1
   });
-  t.device.getQueue().submit([encoder.finish()]);
+  t.device.defaultQueue.submit([encoder.finish()]);
   t.expectContents(dst, new Uint8Array([0x00, 0xff, 0x00, 0xff]));
 });
 //# sourceMappingURL=rendering.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js
index 0326cf65ad69..ae92995aa6b7 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js
@@ -98,7 +98,7 @@ g.test('storeOp controls whether 1x1 drawn quad is stored', async t => {
     height: 1,
     depth: 1
   });
-  t.device.getQueue().submit([encoder.finish()]); // expect the buffer to be clear
+  t.device.defaultQueue.submit([encoder.finish()]); // expect the buffer to be clear
 
   const expectedContent = new Uint32Array([t.params._expected]);
   t.expectContents(dstBuffer, expectedContent);
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js
index a324e8839e50..67429b9a2551 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js
@@ -25,7 +25,7 @@ export class GPUTest extends Fixture {
     const gpu = getGPU();
     const adapter = await gpu.requestAdapter();
     this.device = await adapter.requestDevice();
-    this.queue = this.device.getQueue();
+    this.queue = this.device.defaultQueue;
     const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
 
     if (isSafari) {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js
index 0ff9699a3ad3..475d0835a0af 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/error_scope.spec.js
@@ -31,7 +31,7 @@ class F extends Fixture {
 
     }); // TODO: Remove when chrome does it automatically.
 
-    this.device.getQueue().submit([]);
+    this.device.defaultQueue.submit([]);
   } // Expect an uncapturederror event to occur. Note: this MUST be awaited, because
   // otherwise it could erroneously pass by capturing an error from later in the test.
 
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/fences.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/fences.spec.js
index 6c5c9f9faa14..2bc85261d3dc 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/fences.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/fences.spec.js
@@ -51,7 +51,7 @@ g.test('increasing fence value by more than 1 succeeds', async t => {
 g.test('signal a fence on a different device than it was created on is invalid', async t => {
   const fence = t.queue.createFence();
   const anotherDevice = await t.device.adapter.requestDevice();
-  const anotherQueue = anotherDevice.getQueue();
+  const anotherQueue = anotherDevice.defaultQueue;
   t.expectValidationError(() => {
     anotherQueue.signal(fence, 2);
   });
@@ -61,7 +61,7 @@ g.test('signal a fence on a different device does not update fence signaled valu
     initialValue: 1
   });
   const anotherDevice = await t.device.adapter.requestDevice();
-  const anotherQueue = anotherDevice.getQueue();
+  const anotherQueue = anotherDevice.defaultQueue;
   t.expectValidationError(() => {
     anotherQueue.signal(fence, 2);
   });
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-events.html b/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-events.html
index dc4ea7bde13c..57b691a9cd62 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-events.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCSctpTransport-events.html
@@ -49,8 +49,7 @@
   const pc2ClosedWaiter = waitForState(pc2.sctp, 'closed');
   pc1.close();
   await pc1ClosedWaiter;
-  // TODO(https://bugs.webrtc.org/10468): Check for closed event
-  // await pc2ClosedWaiter;
+  await pc2ClosedWaiter;
 }, 'SctpTransport reaches connected and closed state');
 
 </script>