From ad01659bd0bbaa9e21fb7edab2c0e6f77fdd233b Mon Sep 17 00:00:00 2001
From: Khafra <maitken033380023@gmail.com>
Date: Thu, 30 Nov 2023 23:07:24 -0500
Subject: [PATCH 1/7] update spec & wpts

restore fetch error

debug time
---
 lib/core/util.js                              |   7 +-
 lib/fetch/body.js                             |   6 +-
 lib/fetch/dataURL.js                          |   8 +-
 lib/fetch/index.js                            | 316 ++++++++++++------
 lib/fetch/util.js                             | 171 +++++++++-
 test/wpt/status/fetch.status.json             |   4 +
 test/wpt/tests/.azure-pipelines.yml           |  30 +-
 test/wpt/tests/.taskcluster.yml               |   4 +-
 test/wpt/tests/FileAPI/META.yml               |   2 +-
 .../wpt/tests/FileAPI/blob/Blob-stream.any.js |  13 +-
 test/wpt/tests/common/META.yml                |   1 -
 .../wpt/tests/common/dispatcher/dispatcher.js |  23 +-
 test/wpt/tests/common/dummy.json              |   1 +
 .../security-features/subresource/video.py    |   4 +-
 test/wpt/tests/common/top-layer.js            |  29 ++
 .../basic/request-forbidden-headers.any.js    |  18 -
 ...t-private-network-headers.tentative.any.js |  18 +
 .../fetch/api/basic/url-parsing.sub.html      |  33 ++
 .../fetch/api/cors/cors-keepalive.any.js      |  10 +-
 .../api/redirect/redirect-keepalive.any.js    |  70 +---
 .../redirect/redirect-keepalive.https.any.js  |  20 ++
 .../destination/fetch-destination.https.html  |  50 +++
 .../request/destination/resources/dummy.css   |   0
 .../request/destination/resources/dummy.json  |   1 +
 .../resources/import-declaration-type-css.js  |   1 +
 .../resources/import-declaration-type-json.js |   1 +
 .../fetch/api/request/request-headers.any.js  |   1 -
 .../fetch/api/resources/keepalive-helper.js   | 113 ++++++-
 .../fetch/api/resources/keepalive-iframe.html |   7 +-
 .../tests/fetch/api/resources/stash-put.py    |  26 +-
 test/wpt/tests/fetch/api/resources/utils.js   |  15 +
 .../response/response-consume-stream.any.js   |  19 ++
 .../response/response-headers-guard.any.js    |   8 +
 .../api/response/response-static-error.any.js |  12 -
 .../big-gzip-body.https.any.js                |  55 +++
 .../content-encoding/resources/big.text.gz    | Bin 0 -> 65509 bytes
 .../resources/big.text.gz.headers             |   3 +
 .../activate-after.tentative.https.window.js  |  55 +++
 .../basic.tentative.https.window.js           |  38 ++-
 .../basic.tentative.https.worker.js           |   6 +
 ...ferrer-when-downgrade.tentative.https.html |  23 ++
 ...-referrer-no-referrer.tentative.https.html |  19 ++
 ...gin-when-cross-origin.tentative.https.html |  25 ++
 ...eader-referrer-origin.tentative.https.html |  23 ++
 ...-referrer-same-origin.tentative.https.html |  24 ++
 ...gin-when-cross-origin.tentative.https.html |  24 ++
 ...eferrer-strict-origin.tentative.https.html |  24 ++
 ...r-referrer-unsafe-url.tentative.https.html |  24 ++
 .../iframe.tentative.https.window.js          |  65 ++++
 .../new-window.tentative.https.window.js      |  77 +++++
 .../csp-allowed.tentative.https.window.js     |  28 ++
 .../csp-blocked.tentative.https.window.js     |  33 ++
 ...irect-to-blocked.tentative.https.window.js |  35 ++
 .../quota.tentative.https.window.js           | 130 +++++++
 .../fetch-later/resources/fetch-later.html    |  14 +
 .../resources/header-referrer-helper.js       |  39 +++
 ...nd-on-deactivate.tentative.https.window.js | 185 ++++++++++
 ...send-after-abort.tentative.https.window.js |  25 ++
 ...h-activate-after.tentative.https.window.js |  32 ++
 .../send-multiple.tentative.https.window.js}  |  12 +-
 .../fetch/metadata/portal.https.sub.html      |  50 ---
 test/wpt/tests/fetch/orb/resources/utils.js   |  89 ++++-
 .../orb/tentative/content-range.sub.any.js    |  39 +--
 .../orb/tentative/known-mime-type.sub.any.js  | 145 ++++----
 .../fetch/orb/tentative/nosniff.sub.any.js    |  77 ++---
 .../fetch/orb/tentative/status.sub.any.js     |  39 +--
 .../tentative/unknown-mime-type.sub.any.js    |  52 +--
 ...eflight-required.tentative.https.window.js |  16 +-
 .../iframe.tentative.https.window.js          |  13 +-
 .../iframe.tentative.window.js                |   2 +-
 ...-private-network-access-target.https.html} |   0
 ...d-frame-private-network-access.https.html} |   0
 ...private-network-access.https.html.headers} |   0
 .../resources/opener.html                     |  11 +
 .../resources/preflight.py                    |  17 +-
 .../resources/support.sub.js                  |  33 +-
 .../window-open.tentative.https.window.js     | 200 +++++++++++
 .../window-open.tentative.window.js           |  94 ++++++
 test/wpt/tests/interfaces/FedCM.idl           |  40 ++-
 .../interfaces/WEBGL_clip_cull_distance.idl   |   2 +-
 .../wpt/tests/interfaces/WEBGL_multi_draw.idl |  20 +-
 ...aw_instanced_base_vertex_base_instance.idl |  18 +-
 test/wpt/tests/interfaces/accelerometer.idl   |  12 -
 test/wpt/tests/interfaces/ambient-light.idl   |   4 -
 test/wpt/tests/interfaces/audio-session.idl   |  33 ++
 .../interfaces/captured-mouse-events.idl      |  20 ++
 test/wpt/tests/interfaces/clipboard-apis.idl  |   8 +-
 test/wpt/tests/interfaces/close-watcher.idl   |  19 --
 test/wpt/tests/interfaces/cookie-store.idl    |   3 +
 .../interfaces/credential-management.idl      |   2 +-
 .../tests/interfaces/css-anchor-position.idl  |   3 +
 .../wpt/tests/interfaces/css-font-loading.idl |   2 -
 test/wpt/tests/interfaces/css-fonts.idl       |   4 +-
 test/wpt/tests/interfaces/css-nesting.idl     |  10 -
 .../tests/interfaces/css-toggle.tentative.idl |  51 ---
 .../tests/interfaces/css-transitions-2.idl    |   4 +
 test/wpt/tests/interfaces/css-typed-om.idl    |   9 +-
 .../interfaces/css-view-transitions-2.idl     |  30 ++
 .../tests/interfaces/css-view-transitions.idl |   4 -
 test/wpt/tests/interfaces/cssom.idl           |  12 +-
 .../document-picture-in-picture.idl           |   3 +-
 test/wpt/tests/interfaces/dom.idl             |   1 +
 test/wpt/tests/interfaces/edit-context.idl    |  26 +-
 test/wpt/tests/interfaces/element-capture.idl |  14 +
 test/wpt/tests/interfaces/encoding.idl        |   2 +-
 test/wpt/tests/interfaces/encrypted-media.idl |  17 +
 test/wpt/tests/interfaces/event-timing.idl    |   2 +-
 test/wpt/tests/interfaces/fenced-frame.idl    |  29 +-
 test/wpt/tests/interfaces/fetch.idl           |   2 +-
 .../tests/interfaces/file-system-access.idl   |   2 +-
 test/wpt/tests/interfaces/fs.idl              |   4 +-
 test/wpt/tests/interfaces/generic-sensor.idl  |  30 --
 .../tests/interfaces/geolocation-sensor.idl   |  10 -
 test/wpt/tests/interfaces/gpc-spec.idl        |  10 -
 test/wpt/tests/interfaces/gyroscope.idl       |   6 -
 test/wpt/tests/interfaces/html.idl            | 215 +++++++++++-
 test/wpt/tests/interfaces/image-capture.idl   |   2 +-
 .../interfaces/intersection-observer.idl      |   2 +
 .../tests/interfaces/invokers.tentative.idl   |  15 +
 test/wpt/tests/interfaces/longtasks.idl       |   9 +
 test/wpt/tests/interfaces/magnetometer.idl    |  15 -
 .../interfaces/managed-configuration.idl      |  20 ++
 test/wpt/tests/interfaces/media-source.idl    |  14 +-
 .../tests/interfaces/mediacapture-streams.idl |   6 +-
 test/wpt/tests/interfaces/mediasession.idl    |   5 +-
 .../tests/interfaces/navigation-timing.idl    |   1 +
 .../tests/interfaces/orientation-event.idl    |   8 +-
 .../tests/interfaces/orientation-sensor.idl   |   7 -
 .../tests/interfaces/performance-timeline.idl |   2 +
 .../interfaces/private-network-access.idl     |  19 ++
 test/wpt/tests/interfaces/proximity.idl       |   6 -
 .../tests/interfaces/real-world-meshing.idl   |   2 +-
 test/wpt/tests/interfaces/screen-capture.idl  |   7 +
 .../tests/interfaces/scroll-animations.idl    |  13 +-
 .../secure-payment-confirmation.idl           |   4 +
 test/wpt/tests/interfaces/serial.idl          |   3 +
 test/wpt/tests/interfaces/shared-storage.idl  |  17 +
 test/wpt/tests/interfaces/storage-buckets.idl |  14 +-
 .../interfaces/storage-buckets.tentative.idl  |  36 --
 test/wpt/tests/interfaces/streams.idl         |  10 +-
 .../tests/interfaces/sub-apps.tentative.idl   |  17 -
 test/wpt/tests/interfaces/trust-token-api.idl |   8 +
 test/wpt/tests/interfaces/turtledove.idl      | 168 ++++++++--
 test/wpt/tests/interfaces/ua-client-hints.idl |   2 +-
 test/wpt/tests/interfaces/uievents.idl        |   2 +
 test/wpt/tests/interfaces/urlpattern.idl      |   2 +-
 test/wpt/tests/interfaces/web-animations.idl  | 106 +++---
 .../interfaces/web-bluetooth-scanning.idl     |  67 ++++
 test/wpt/tests/interfaces/webaudio.idl        |   9 +
 test/wpt/tests/interfaces/webauthn.idl        |  53 ++-
 .../webcodecs-hevc-codec-registration.idl     |   8 +
 test/wpt/tests/interfaces/webcodecs.idl       |  23 +-
 test/wpt/tests/interfaces/webgl1.idl          |   4 +-
 test/wpt/tests/interfaces/webgl2.idl          |  76 ++---
 test/wpt/tests/interfaces/webgpu.idl          |  36 +-
 test/wpt/tests/interfaces/webhid.idl          |   2 +-
 test/wpt/tests/interfaces/webidl.idl          |   1 +
 test/wpt/tests/interfaces/webmidi.idl         |   4 +-
 test/wpt/tests/interfaces/webnn.idl           |  55 +--
 .../interfaces/webrtc-encoded-transform.idl   |  10 +-
 test/wpt/tests/interfaces/webrtc-stats.idl    |   5 +-
 test/wpt/tests/interfaces/webrtc.idl          |   6 +-
 test/wpt/tests/interfaces/webtransport.idl    |  28 +-
 test/wpt/tests/interfaces/webusb.idl          |   9 +
 .../interfaces/webxr-plane-detection.idl      |  32 ++
 test/wpt/tests/interfaces/webxr.idl           |   3 +-
 test/wpt/tests/lint.ignore                    |  65 +++-
 test/wpt/tests/resources/check-layout-th.js   |   3 +-
 .../tests/resources/chromium/fake-serial.js   |   6 +-
 .../chromium/generic_sensor_mocks.js          |  14 +-
 .../tests/resources/chromium/webxr-test.js    |  21 +-
 .../test/tests/functional/step_wait.html      |  22 ++
 .../resources/test/tests/unit/late-test.html  |  14 +-
 test/wpt/tests/resources/testdriver.js        | 243 +++++++++++++-
 test/wpt/tests/resources/testharness.js       |  31 +-
 .../partitioned-cookies.tentative.https.html  |  93 ++----
 .../resources/fetch-access-control.py         |   4 +-
 .../partitioned-cookies-3p-frame.html         |  77 ++---
 .../resources/partitioned-cookies-3p-sw.js    |  56 +---
 .../partitioned-cookies-test-helpers.js       |  31 ++
 .../resources/scope1/redirect.py              |   6 +-
 .../worker_interception_redirect_webworker.py |   6 +-
 .../worker_interception_redirect_webworker.py |   6 +-
 .../tentative/static-router/README.md         |   2 +-
 .../resources/or-test/direct1.text            |   1 +
 .../resources/or-test/direct1.text.headers    |   1 +
 .../resources/or-test/direct2.text            |   1 +
 .../resources/or-test/direct2.text.headers    |   1 +
 .../static-router/resources/router-rules.js   |  30 ++
 .../static-router/resources/simple.csv        |   1 +
 .../resources/static-router-sw.js             |  19 +-
 .../static-router-main-resource.https.html    |  24 +-
 .../static-router-subresource.https.html      | 125 ++++++-
 test/wpt/tests/storage/buckets/META.yml       |   8 +-
 ...ket-quota-indexeddb.tentative.https.any.js |  11 +-
 .../storage/estimate-indexeddb.https.any.js   |  17 +-
 .../storagemanager-estimate.https.any.js      |  68 +---
 test/wpt/tests/websockets/META.yml            |   1 -
 .../websockets/handlers/sleep_10_v13_wsh.py   |  11 +-
 .../close/close-connecting-async.any.js       |  31 ++
 .../websockets/opening-handshake/006.html     |  58 ++++
 test/wpt/tests/xhr/resources/auth1/auth.py    |   5 +-
 test/wpt/tests/xhr/resources/auth10/auth.py   |   6 +-
 test/wpt/tests/xhr/resources/auth11/auth.py   |   5 +-
 test/wpt/tests/xhr/resources/auth2/auth.py    |   6 +-
 .../tests/xhr/resources/auth2/corsenabled.py  |   5 +-
 test/wpt/tests/xhr/resources/auth3/auth.py    |   5 +-
 test/wpt/tests/xhr/resources/auth4/auth.py    |   5 +-
 .../tests/xhr/resources/auth7/corsenabled.py  |   5 +-
 .../auth8/corsenabled-no-authorize.py         |   5 +-
 test/wpt/tests/xhr/resources/auth9/auth.py    |   5 +-
 .../xhr/responsexml-document-properties.htm   |   7 +-
 test/wpt/tests/xhr/send-redirect.htm          |  33 +-
 213 files changed, 4310 insertions(+), 1483 deletions(-)
 create mode 100644 test/wpt/tests/common/dummy.json
 create mode 100644 test/wpt/tests/common/top-layer.js
 create mode 100644 test/wpt/tests/fetch/api/basic/request-private-network-headers.tentative.any.js
 create mode 100644 test/wpt/tests/fetch/api/basic/url-parsing.sub.html
 create mode 100644 test/wpt/tests/fetch/api/redirect/redirect-keepalive.https.any.js
 create mode 100644 test/wpt/tests/fetch/api/request/destination/resources/dummy.css
 create mode 100644 test/wpt/tests/fetch/api/request/destination/resources/dummy.json
 create mode 100644 test/wpt/tests/fetch/api/request/destination/resources/import-declaration-type-css.js
 create mode 100644 test/wpt/tests/fetch/api/request/destination/resources/import-declaration-type-json.js
 create mode 100644 test/wpt/tests/fetch/api/response/response-headers-guard.any.js
 create mode 100644 test/wpt/tests/fetch/content-encoding/big-gzip-body.https.any.js
 create mode 100644 test/wpt/tests/fetch/content-encoding/resources/big.text.gz
 create mode 100644 test/wpt/tests/fetch/content-encoding/resources/big.text.gz.headers
 create mode 100644 test/wpt/tests/fetch/fetch-later/activate-after.tentative.https.window.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/basic.tentative.https.worker.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/headers/header-referrer-no-referrer-when-downgrade.tentative.https.html
 create mode 100644 test/wpt/tests/fetch/fetch-later/headers/header-referrer-no-referrer.tentative.https.html
 create mode 100644 test/wpt/tests/fetch/fetch-later/headers/header-referrer-origin-when-cross-origin.tentative.https.html
 create mode 100644 test/wpt/tests/fetch/fetch-later/headers/header-referrer-origin.tentative.https.html
 create mode 100644 test/wpt/tests/fetch/fetch-later/headers/header-referrer-same-origin.tentative.https.html
 create mode 100644 test/wpt/tests/fetch/fetch-later/headers/header-referrer-strict-origin-when-cross-origin.tentative.https.html
 create mode 100644 test/wpt/tests/fetch/fetch-later/headers/header-referrer-strict-origin.tentative.https.html
 create mode 100644 test/wpt/tests/fetch/fetch-later/headers/header-referrer-unsafe-url.tentative.https.html
 create mode 100644 test/wpt/tests/fetch/fetch-later/iframe.tentative.https.window.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/new-window.tentative.https.window.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/policies/csp-allowed.tentative.https.window.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/policies/csp-blocked.tentative.https.window.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/policies/csp-redirect-to-blocked.tentative.https.window.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/resources/fetch-later.html
 create mode 100644 test/wpt/tests/fetch/fetch-later/resources/header-referrer-helper.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/send-on-deactivate.tentative.https.window.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/send-on-discard/not-send-after-abort.tentative.https.window.js
 create mode 100644 test/wpt/tests/fetch/fetch-later/send-on-discard/send-multiple-with-activate-after.tentative.https.window.js
 rename test/wpt/tests/fetch/fetch-later/{sendondiscard.tentative.https.window.js => send-on-discard/send-multiple.tentative.https.window.js} (69%)
 delete mode 100644 test/wpt/tests/fetch/metadata/portal.https.sub.html
 rename test/wpt/tests/fetch/private-network-access/resources/{fenced-frame-local-network-access-target.https.html => fenced-frame-private-network-access-target.https.html} (100%)
 rename test/wpt/tests/fetch/private-network-access/resources/{fenced-frame-local-network-access.https.html => fenced-frame-private-network-access.https.html} (100%)
 rename test/wpt/tests/fetch/private-network-access/resources/{fenced-frame-local-network-access.https.html.headers => fenced-frame-private-network-access.https.html.headers} (100%)
 create mode 100644 test/wpt/tests/fetch/private-network-access/resources/opener.html
 create mode 100644 test/wpt/tests/fetch/private-network-access/window-open.tentative.https.window.js
 create mode 100644 test/wpt/tests/fetch/private-network-access/window-open.tentative.window.js
 create mode 100644 test/wpt/tests/interfaces/audio-session.idl
 create mode 100644 test/wpt/tests/interfaces/captured-mouse-events.idl
 delete mode 100644 test/wpt/tests/interfaces/close-watcher.idl
 delete mode 100644 test/wpt/tests/interfaces/css-nesting.idl
 delete mode 100644 test/wpt/tests/interfaces/css-toggle.tentative.idl
 create mode 100644 test/wpt/tests/interfaces/css-view-transitions-2.idl
 create mode 100644 test/wpt/tests/interfaces/element-capture.idl
 delete mode 100644 test/wpt/tests/interfaces/gpc-spec.idl
 create mode 100644 test/wpt/tests/interfaces/invokers.tentative.idl
 create mode 100644 test/wpt/tests/interfaces/managed-configuration.idl
 create mode 100644 test/wpt/tests/interfaces/private-network-access.idl
 delete mode 100644 test/wpt/tests/interfaces/storage-buckets.tentative.idl
 delete mode 100644 test/wpt/tests/interfaces/sub-apps.tentative.idl
 create mode 100644 test/wpt/tests/interfaces/web-bluetooth-scanning.idl
 create mode 100644 test/wpt/tests/interfaces/webxr-plane-detection.idl
 create mode 100644 test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-test-helpers.js
 create mode 100644 test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct1.text
 create mode 100644 test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct1.text.headers
 create mode 100644 test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct2.text
 create mode 100644 test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct2.text.headers
 create mode 100644 test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/router-rules.js
 create mode 100644 test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/simple.csv
 create mode 100644 test/wpt/tests/websockets/interfaces/WebSocket/close/close-connecting-async.any.js
 create mode 100644 test/wpt/tests/websockets/opening-handshake/006.html

diff --git a/lib/core/util.js b/lib/core/util.js
index 8d5450ba0c0..c9524b32a80 100644
--- a/lib/core/util.js
+++ b/lib/core/util.js
@@ -365,6 +365,7 @@ async function * convertIterableToBuffer (iterable) {
   }
 }
 
+/** @type {globalThis['ReadableStream']} */
 let ReadableStream
 function ReadableStreamFrom (iterable) {
   if (!ReadableStream) {
@@ -395,9 +396,9 @@ function ReadableStreamFrom (iterable) {
       },
       async cancel (reason) {
         await iterator.return()
-      }
-    },
-    0
+      },
+      type: 'bytes'
+    }
   )
 }
 
diff --git a/lib/fetch/body.js b/lib/fetch/body.js
index fd8481b796d..19e5a8a2658 100644
--- a/lib/fetch/body.js
+++ b/lib/fetch/body.js
@@ -47,7 +47,7 @@ function extractBody (object, keepalive = false) {
     stream = object.stream()
   } else {
     // 4. Otherwise, set stream to a new ReadableStream object, and set
-    //    up stream.
+    //    up stream with byte reading support.
     stream = new ReadableStream({
       async pull (controller) {
         controller.enqueue(
@@ -56,7 +56,7 @@ function extractBody (object, keepalive = false) {
         queueMicrotask(() => readableStreamClose(controller))
       },
       start () {},
-      type: undefined
+      type: 'bytes'
     })
   }
 
@@ -237,7 +237,7 @@ function extractBody (object, keepalive = false) {
       async cancel (reason) {
         await iterator.return()
       },
-      type: undefined
+      type: 'bytes'
     })
   }
 
diff --git a/lib/fetch/dataURL.js b/lib/fetch/dataURL.js
index 7b6a606106d..5c1a1760dd0 100644
--- a/lib/fetch/dataURL.js
+++ b/lib/fetch/dataURL.js
@@ -126,7 +126,13 @@ function URLSerializer (url, excludeFragment = false) {
   const href = url.href
   const hashLength = url.hash.length
 
-  return hashLength === 0 ? href : href.substring(0, href.length - hashLength)
+  const serialized = hashLength === 0 ? href : href.substring(0, href.length - hashLength)
+
+  if (!hashLength && href.endsWith('#')) {
+    return serialized.slice(0, -1)
+  }
+
+  return serialized
 }
 
 // https://infra.spec.whatwg.org/#collect-a-sequence-of-code-points
diff --git a/lib/fetch/index.js b/lib/fetch/index.js
index 17c3d87ea62..253ad51394c 100644
--- a/lib/fetch/index.js
+++ b/lib/fetch/index.js
@@ -40,11 +40,13 @@ const {
   isomorphicEncode,
   urlIsLocal,
   urlIsHttpHttpsScheme,
-  urlHasHttpsScheme
+  urlHasHttpsScheme,
+  simpleRangeHeaderValue,
+  buildContentRange
 } = require('./util')
 const { kState, kHeaders, kGuard, kRealm } = require('./symbols')
 const assert = require('assert')
-const { safelyExtractBody } = require('./body')
+const { safelyExtractBody, extractBody } = require('./body')
 const {
   redirectStatusSet,
   nullBodyStatus,
@@ -57,7 +59,7 @@ const { kHeadersList } = require('../core/symbols')
 const EE = require('events')
 const { Readable, pipeline } = require('stream')
 const { addAbortListener, isErrored, isReadable, nodeMajor, nodeMinor } = require('../core/util')
-const { dataURLProcessor, serializeAMimeType } = require('./dataURL')
+const { dataURLProcessor, serializeAMimeType, parseMIMEType } = require('./dataURL')
 const { TransformStream } = require('stream/web')
 const { getGlobalDispatcher } = require('../global')
 const { webidl } = require('./webidl')
@@ -815,38 +817,118 @@ function schemeFetch (fetchParams) {
         return Promise.resolve(makeNetworkError('NetworkError when attempting to fetch resource.'))
       }
 
-      const blobURLEntryObject = resolveObjectURL(blobURLEntry.toString())
+      const blob = resolveObjectURL(blobURLEntry.toString())
 
       // 2. If request’s method is not `GET`, blobURLEntry is null, or blobURLEntry’s
       //    object is not a Blob object, then return a network error.
-      if (request.method !== 'GET' || !isBlobLike(blobURLEntryObject)) {
+      if (request.method !== 'GET' || !isBlobLike(blob)) {
         return Promise.resolve(makeNetworkError('invalid method'))
       }
 
-      // 3. Let bodyWithType be the result of safely extracting blobURLEntry’s object.
-      const bodyWithType = safelyExtractBody(blobURLEntryObject)
+      // 3. Let blob be blobURLEntry’s object.
+      // Note: done above
 
-      // 4. Let body be bodyWithType’s body.
-      const body = bodyWithType[0]
+      // 4. Let response be a new response.
+      const response = makeResponse()
 
-      // 5. Let length be body’s length, serialized and isomorphic encoded.
-      const length = isomorphicEncode(`${body.length}`)
+      // 5. Let fullLength be blob’s size.
+      const fullLength = blob.size
 
-      // 6. Let type be bodyWithType’s type if it is non-null; otherwise the empty byte sequence.
-      const type = bodyWithType[1] ?? ''
+      // 6. Let serializedFullLength be fullLength, serialized and isomorphic encoded.
+      const serializedFullLength = isomorphicEncode(`${fullLength}`)
 
-      // 7. Return a new response whose status message is `OK`, header list is
-      //    « (`Content-Length`, length), (`Content-Type`, type) », and body is body.
-      const response = makeResponse({
-        statusText: 'OK',
-        headersList: [
-          ['content-length', { name: 'Content-Length', value: length }],
-          ['content-type', { name: 'Content-Type', value: type }]
-        ]
-      })
+      // 7. Let type be blob’s type.
+      const type = blob.type
+
+      // 8. If request’s header list does not contain `Range`:
+      // 9. Otherwise:
+      if (!request.headersList.contains('range')) {
+        // 1. Let bodyWithType be the result of safely extracting blob.
+        // Note: in the FileAPI a blob "object" is a Blob *or* a MediaSource.
+        // In node, this can only ever be a Blob. Therefore we can safely
+        // use extractBody directly.
+        const bodyWithType = extractBody(blob)
+
+        // 2. Set response’s status message to `OK`.
+        response.statusText = 'OK'
+
+        // 3. Set response’s body to bodyWithType’s body.
+        response.body = bodyWithType[0]
+
+        // 4. Set response’s header list to « (`Content-Length`, serializedFullLength), (`Content-Type`, type) ».
+        response.headersList.set('content-length', serializedFullLength)
+        response.headersList.set('content-type', type)
+      } else {
+        // 1. Set response’s range-requested flag.
+        response.rangeRequested = true
+
+        // 2. Let rangeHeader be the result of getting `Range` from request’s header list.
+        const rangeHeader = request.headersList.get('range')
+
+        // 3. Let rangeValue be the result of parsing a single range header value given rangeHeader and true.
+        const rangeValue = simpleRangeHeaderValue(rangeHeader, true)
+
+        // 4. If rangeValue is failure, then return a network error.
+        if (rangeValue === 'failure') {
+          return Promise.resolve(makeNetworkError('failed to fetch the data URL'))
+        }
+
+        // 5. Let (rangeStart, rangeEnd) be rangeValue.
+        let { rangeStartValue: rangeStart, rangeEndValue: rangeEnd } = rangeValue
+
+        // 6. If rangeStart is null:
+        // 7. Otherwise:
+        if (rangeStart === null) {
+          // 1. Set rangeStart to fullLength − rangeEnd.
+          rangeStart = fullLength - rangeEnd
+
+          // 2. Set rangeEnd to rangeStart + rangeEnd − 1.
+          rangeEnd = rangeStart + rangeEnd - 1
+        } else {
+          // 1. If rangeStart is greater than or equal to fullLength, then return a network error.
+          if (rangeStart >= fullLength) {
+            return Promise.resolve(makeNetworkError('Range start is greater than the blob\'s size.'))
+          }
+
+          // 2. If rangeEnd is null or rangeEnd is greater than or equal to fullLength, then set
+          //    rangeEnd to fullLength − 1.
+          if (rangeEnd === null || rangeEnd >= fullLength) {
+            rangeEnd = fullLength - 1
+          }
+        }
 
-      response.body = body
+        // 8. Let slicedBlob be the result of invoking slice blob given blob, rangeStart,
+        //    rangeEnd + 1, and type.
+        const slicedBlob = blob.slice(rangeStart, rangeEnd, type)
 
+        // 9. Let slicedBodyWithType be the result of safely extracting slicedBlob.
+        // Note: same reason as mentioned above as to why we use extractBody
+        const slicedBodyWithType = extractBody(slicedBlob)
+
+        // 10. Set response’s body to slicedBodyWithType’s body.
+        response.body = slicedBodyWithType[0]
+
+        // 11. Let serializedSlicedLength be slicedBlob’s size, serialized and isomorphic encoded.
+        const serializedSlicedLength = isomorphicEncode(`${slicedBlob.size}`)
+
+        // 12. Let contentRange be the result of invoking build a content range given rangeStart,
+        //     rangeEnd, and fullLength.
+        const contentRange = buildContentRange(rangeStart, rangeEnd, fullLength)
+
+        // 13. Set response’s status to 206.
+        response.status = 206
+
+        // 14. Set response’s status message to `Partial Content`.
+        response.statusText = 'Partial Content'
+
+        // 15. Set response’s header list to « (`Content-Length`, serializedSlicedLength),
+        //     (`Content-Type`, type), (`Content-Range`, contentRange) ».
+        response.headersList.set('content-length', serializedSlicedLength)
+        response.headersList.set('content-type', type)
+        response.headersList.set('content-range', contentRange)
+      }
+
+      // 10. Return response.
       return Promise.resolve(response)
     }
     case 'data:': {
@@ -908,92 +990,126 @@ function finalizeResponse (fetchParams, response) {
 
 // https://fetch.spec.whatwg.org/#fetch-finale
 function fetchFinale (fetchParams, response) {
-  // 1. If response is a network error, then:
-  if (response.type === 'error') {
-    // 1. Set response’s URL list to « fetchParams’s request’s URL list[0] ».
-    response.urlList = [fetchParams.request.urlList[0]]
-
-    // 2. Set response’s timing info to the result of creating an opaque timing
-    // info for fetchParams’s timing info.
-    response.timingInfo = createOpaqueTimingInfo({
-      startTime: fetchParams.timingInfo.startTime
-    })
-  }
+  // 1. Let timingInfo be fetchParams’s timing info.
+  let timingInfo = fetchParams.timingInfo
 
-  // 2. Let processResponseEndOfBody be the following steps:
+  // 2. If response is not a network error and fetchParams’s request’s client is a secure context,
+  //    then set timingInfo’s server-timing headers to the result of getting, decoding, and splitting
+  //    `Server-Timing` from response’s internal response’s header list.
+  // TODO
+
+  // 3. Let processResponseEndOfBody be the following steps:
   const processResponseEndOfBody = () => {
-    // 1. Set fetchParams’s request’s done flag.
-    fetchParams.request.done = true
-
-    // If fetchParams’s process response end-of-body is not null,
-    // then queue a fetch task to run fetchParams’s process response
-    // end-of-body given response with fetchParams’s task destination.
-    if (fetchParams.processResponseEndOfBody != null) {
-      queueMicrotask(() => fetchParams.processResponseEndOfBody(response))
+    // 1. Let unsafeEndTime be the unsafe shared current time.
+    const unsafeEndTime = Date.now() // ?
+
+    // 2. If fetchParams’s request’s destination is "document", then set fetchParams’s controller’s
+    //    full timing info to fetchParams’s timing info.
+    if (fetchParams.request.destination === 'document') {
+      fetchParams.controller.fullTimingInfo = timingInfo
     }
-  }
 
-  // 3. If fetchParams’s process response is non-null, then queue a fetch task
-  // to run fetchParams’s process response given response, with fetchParams’s
-  // task destination.
-  if (fetchParams.processResponse != null) {
-    queueMicrotask(() => fetchParams.processResponse(response))
-  }
+    // 3. Set fetchParams’s controller’s report timing steps to the following steps given a global object global:
+    fetchParams.controller.reportTimingSteps = () => {
+      // 1. If fetchParams’s request’s URL’s scheme is not an HTTP(S) scheme, then return.
+      if (fetchParams.request.url.protocol !== 'https:') {
+        return
+      }
 
-  // 4. If response’s body is null, then run processResponseEndOfBody.
-  if (response.body == null) {
-    processResponseEndOfBody()
-  } else {
-  // 5. Otherwise:
+      // 2. Set timingInfo’s end time to the relative high resolution time given unsafeEndTime and global.
+      timingInfo.endTime = unsafeEndTime
+
+      // 3. Let cacheState be response’s cache state.
+      let cacheState = response.cacheState
+
+      // 4. Let bodyInfo be response’s body info.
+      const bodyInfo = response.bodyInfo
+
+      // 5. If response’s timing allow passed flag is not set, then set timingInfo to the result of creating an
+      //    opaque timing info for timingInfo and set cacheState to the empty string.
+      if (!response.timingAllowPassed) {
+        timingInfo = createOpaqueTimingInfo(timingInfo)
 
-    // 1. Let transformStream be a new a TransformStream.
+        cacheState = ''
+      }
+
+      // 6. Let responseStatus be 0.
+      let responseStatus = 0
+
+      // 7. If fetchParams’s request’s mode is not "navigate" or response’s has-cross-origin-redirects is false:
+      if (fetchParams.request.mode !== 'navigator' || !response.hasCrossOriginRedirects) {
+        // 1. Set responseStatus to response’s status.
+        responseStatus = response.status
 
-    // 2. Let identityTransformAlgorithm be an algorithm which, given chunk,
-    // enqueues chunk in transformStream.
-    const identityTransformAlgorithm = (chunk, controller) => {
-      controller.enqueue(chunk)
+        // 2. Let mimeType be the result of extracting a MIME type from response’s header list.
+        const mimeType = parseMIMEType(response.headersList.get('content-type')) // TODO: fix
+
+        // 3. If mimeType is not failure, then set bodyInfo’s content type to the result of minimizing a supported MIME type given mimeType.
+        if (mimeType !== 'failure') {
+          // TODO
+        }
+      }
+
+      // 8. If fetchParams’s request’s initiator type is non-null, then mark resource timing given timingInfo,
+      //    fetchParams’s request’s URL, fetchParams’s request’s initiator type, global, cacheState, bodyInfo,
+      //    and responseStatus.
+      if (fetchParams.request.initiatorType != null) {
+        // TODO: update markresourcetiming
+        markResourceTiming(timingInfo, fetchParams.request.url, fetchParams.request.initiatorType, globalThis, cacheState, bodyInfo, responseStatus)
+      }
     }
 
-    // 3. Set up transformStream with transformAlgorithm set to identityTransformAlgorithm
-    // and flushAlgorithm set to processResponseEndOfBody.
-    const transformStream = new TransformStream({
-      start () {},
-      transform: identityTransformAlgorithm,
-      flush: processResponseEndOfBody
-    }, {
-      size () {
-        return 1
+    // 4. Let processResponseEndOfBodyTask be the following steps:
+    const processResponseEndOfBodyTask = () => {
+      // 1. Set fetchParams’s request’s done flag.
+      fetchParams.request.done = true
+
+      // 2. If fetchParams’s process response end-of-body is non-null, then run fetchParams’s process
+      //    response end-of-body given response.
+      if (fetchParams.processResponseEndOfBody != null) {
+        queueMicrotask(() => fetchParams.processResponseEndOfBody(response))
       }
-    }, {
-      size () {
-        return 1
+
+      // 3. If fetchParams’s request’s initiator type is non-null and fetchParams’s request’s client’s
+      //    global object is fetchParams’s task destination, then run fetchParams’s controller’s report
+      //    timing steps given fetchParams’s request’s client’s global object.
+      if (fetchParams.request.initiatorType != null) {
+        fetchParams.controller.reportTimingSteps()
       }
-    })
+    }
 
-    // 4. Set response’s body to the result of piping response’s body through transformStream.
-    response.body = { stream: response.body.stream.pipeThrough(transformStream) }
+    // 5. Queue a fetch task to run processResponseEndOfBodyTask with fetchParams’s task destination
+    queueMicrotask(() => processResponseEndOfBodyTask())
   }
 
-  // 6. If fetchParams’s process response consume body is non-null, then:
-  if (fetchParams.processResponseConsumeBody != null) {
-    // 1. Let processBody given nullOrBytes be this step: run fetchParams’s
-    // process response consume body given response and nullOrBytes.
-    const processBody = (nullOrBytes) => fetchParams.processResponseConsumeBody(response, nullOrBytes)
+  // 4. If fetchParams’s process response is non-null, then queue a fetch task to run fetchParams’s
+  //    process response given response, with fetchParams’s task destination.
+  if (fetchParams.processResponse != null) {
+    queueMicrotask(() => fetchParams.processResponse(response))
+  }
 
-    // 2. Let processBodyError be this step: run fetchParams’s process
-    // response consume body given response and failure.
-    const processBodyError = (failure) => fetchParams.processResponseConsumeBody(response, failure)
+  // 5. Let internalResponse be response, if response is a network error; otherwise response’s internal response.
+  const internalResponse = response.type === 'error' ? response : (response.internalResponse ?? response)
 
-    // 3. If response’s body is null, then queue a fetch task to run processBody
-    // given null, with fetchParams’s task destination.
-    if (response.body == null) {
-      queueMicrotask(() => processBody(null))
-    } else {
-      // 4. Otherwise, fully read response’s body given processBody, processBodyError,
-      // and fetchParams’s task destination.
-      return fullyReadBody(response.body, processBody, processBodyError)
-    }
-    return Promise.resolve()
+  // 6. If internalResponse’s body is null, then run processResponseEndOfBody.
+  // 7. Otherwise:
+  if (internalResponse.body == null) {
+    processResponseEndOfBody()
+  } else {
+    // 1. Let transformStream be a new TransformStream.
+    // 2. Let identityTransformAlgorithm be an algorithm which, given chunk, enqueues chunk in transformStream.
+    // 3. Set up transformStream with transformAlgorithm set to identityTransformAlgorithm and flushAlgorithm
+    //    set to processResponseEndOfBody.
+    const transformStream = new TransformStream({
+      start () {},
+      transform (chunk, controller) {
+        controller.enqueue(chunk)
+      },
+      flush: processResponseEndOfBody
+    })
+
+    // 4. Set internalResponse’s body’s stream to the result of internalResponse’s body’s stream piped through transformStream.
+    internalResponse.body.stream = internalResponse.body.stream.pipeThrough(transformStream)
   }
 }
 
@@ -1795,9 +1911,8 @@ async function httpNetworkFetch (
   // TODO
 
   // 15. Let stream be a new ReadableStream.
-  // 16. Set up stream with pullAlgorithm set to pullAlgorithm,
-  // cancelAlgorithm set to cancelAlgorithm, highWaterMark set to
-  // highWaterMark, and sizeAlgorithm set to sizeAlgorithm.
+  // 16. Set up stream with byte reading support with pullAlgorithm set to pullAlgorithm,
+  //     cancelAlgorithm set to cancelAlgorithm.
   if (!ReadableStream) {
     ReadableStream = require('stream/web').ReadableStream
   }
@@ -1812,13 +1927,8 @@ async function httpNetworkFetch (
       },
       async cancel (reason) {
         await cancelAlgorithm(reason)
-      }
-    },
-    {
-      highWaterMark: 0,
-      size () {
-        return 1
-      }
+      },
+      type: 'bytes'
     }
   )
 
diff --git a/lib/fetch/util.js b/lib/fetch/util.js
index b12142c7f42..6d0412e48b8 100644
--- a/lib/fetch/util.js
+++ b/lib/fetch/util.js
@@ -1018,6 +1018,173 @@ function urlIsHttpHttpsScheme (url) {
   return protocol === 'http:' || protocol === 'https:'
 }
 
+/** @type {import('./dataURL')['collectASequenceOfCodePoints']} */
+let collectASequenceOfCodePoints
+
+/**
+ * @see https://fetch.spec.whatwg.org/#simple-range-header-value
+ * @param {string} value
+ * @param {boolean} allowWhitespace
+ */
+function simpleRangeHeaderValue (value, allowWhitespace) {
+  // Note: avoid circular require
+  collectASequenceOfCodePoints ??= require('./dataURL').collectASequenceOfCodePoints
+
+  // 1. Let data be the isomorphic decoding of value.
+  // Note: isomorphic decoding takes a sequence of bytes (ie. a Uint8Array) and turns it into a string,
+  // nothing more. We obviously don't need to do that if value is a string already.
+  const data = value
+
+  // 2. If data does not start with "bytes", then return failure.
+  if (!data.startsWith('bytes')) {
+    return 'failure'
+  }
+
+  // 3. Let position be a position variable for data, initially pointing at the 5th code point of data.
+  const position = { position: 5 }
+
+  // 4. If allowWhitespace is true, collect a sequence of code points that are HTTP tab or space,
+  //    from data given position.
+  if (allowWhitespace) {
+    collectASequenceOfCodePoints(
+      (char) => char === '\t' || char === ' ',
+      data,
+      position
+    )
+  }
+
+  // 5. If the code point at position within data is not U+003D (=), then return failure.
+  if (data.charCodeAt(position.position) != 0x3D) {
+    return 'failure'
+  }
+
+  // 6. Advance position by 1.
+  position.position++
+
+  // 7. If allowWhitespace is true, collect a sequence of code points that are HTTP tab or space, from
+  //    data given position.
+  if (allowWhitespace) {
+    collectASequenceOfCodePoints(
+      (char) => char === '\t' || char === ' ',
+      data,
+      position
+    )
+  }
+
+  // 8. Let rangeStart be the result of collecting a sequence of code points that are ASCII digits,
+  //    from data given position.
+  const rangeStart = collectASequenceOfCodePoints(
+    (char) => {
+      const code = char.charCodeAt(0)
+
+      return code >= 0x30 && code <= 0x39
+    },
+    data,
+    position
+  )
+
+  // 9. Let rangeStartValue be rangeStart, interpreted as decimal number, if rangeStart is not the
+  //    empty string; otherwise null.
+  const rangeStartValue = rangeStart.length ? Number(rangeStart) : null
+
+  // 10. If allowWhitespace is true, collect a sequence of code points that are HTTP tab or space,
+  //     from data given position.
+  if (allowWhitespace) {
+    collectASequenceOfCodePoints(
+      (char) => char === '\t' || char === ' ',
+      data,
+      position
+    )
+  }
+
+  // 11. If the code point at position within data is not U+002D (-), then return failure.
+  if (data.charCodeAt(position.position) != 0x2D) {
+    return 'failure'
+  }
+
+  // 12. Advance position by 1.
+  position.position++
+
+  // 13. If allowWhitespace is true, collect a sequence of code points that are HTTP tab
+  //     or space, from data given position.
+  // Note from Khafra: its the same fucking step again lol
+  if (allowWhitespace) {
+    collectASequenceOfCodePoints(
+      (char) => char === '\t' || char === ' ',
+      data,
+      position
+    )
+  }
+
+  // 14. Let rangeEnd be the result of collecting a sequence of code points that are
+  //     ASCII digits, from data given position.
+  // Note from Khafra: you wouldn't guess it, but this is also the same step as #8
+  const rangeEnd = collectASequenceOfCodePoints(
+    (char) => {
+      const code = char.charCodeAt(0)
+
+      return code >= 0x30 && code <= 0x39
+    },
+    data,
+    position
+  )
+
+  // 15. Let rangeEndValue be rangeEnd, interpreted as decimal number, if rangeEnd
+  //     is not the empty string; otherwise null.
+  // Note from Khafra: THE SAME STEP, AGAIN!!!
+  // Note: why interpret as a decimal if we only collect ascii digits?
+  const rangeEndValue = rangeEnd.length ? Number(rangeEnd) : null
+
+  // 16. If position is not past the end of data, then return failure.
+  if (position.position < data.length) {
+    return 'failure'
+  }
+
+  // 17. If rangeEndValue and rangeStartValue are null, then return failure.
+  if (rangeEndValue === null && rangeStartValue === null) {
+    return 'failure'
+  }
+
+  // 18. If rangeStartValue and rangeEndValue are numbers, and rangeStartValue is
+  //     greater than rangeEndValue, then return failure.
+  // Note: ... when can they not be numbers?
+  if (rangeStartValue > rangeEndValue) {
+    return 'failure'
+  }
+
+  // 19. Return (rangeStartValue, rangeEndValue).
+  return { rangeStartValue, rangeEndValue }
+}
+
+/**
+ * @see https://fetch.spec.whatwg.org/#build-a-content-range
+ * @param {number} rangeStart
+ * @param {number} rangeEnd
+ * @param {number} fullLength
+ */
+function buildContentRange (rangeStart, rangeEnd, fullLength) {
+  // 1. Let contentRange be `bytes `.
+  let contentRange = 'bytes '
+
+  // 2. Append rangeStart, serialized and isomorphic encoded, to contentRange.
+  contentRange += isomorphicEncode(`${rangeStart}`)
+
+  // 3. Append 0x2D (-) to contentRange.
+  contentRange += '-'
+
+  // 4. Append rangeEnd, serialized and isomorphic encoded to contentRange.
+  contentRange += isomorphicEncode(`${rangeEnd}`)
+
+  // 5. Append 0x2F (/) to contentRange.
+  contentRange += '/'
+
+  // 6. Append fullLength, serialized and isomorphic encoded to contentRange.
+  contentRange += isomorphicEncode(`${fullLength}`)
+
+  // 7. Return contentRange.
+  return contentRange
+}
+
 /**
  * Fetch supports node >= 16.8.0, but Object.hasOwn was added in v16.9.0.
  */
@@ -1067,5 +1234,7 @@ module.exports = {
   urlHasHttpsScheme,
   urlIsHttpHttpsScheme,
   readAllBytes,
-  normalizeMethodRecord
+  normalizeMethodRecord,
+  simpleRangeHeaderValue,
+  buildContentRange
 }
diff --git a/test/wpt/status/fetch.status.json b/test/wpt/status/fetch.status.json
index 5910bf37f6f..1796ee9cd89 100644
--- a/test/wpt/status/fetch.status.json
+++ b/test/wpt/status/fetch.status.json
@@ -71,6 +71,10 @@
           "Fetch with TacO and mode \"cors\" needs an Origin header"
         ]
       },
+      "request-private-network-headers.tentative.any.js": {
+        "note": "undici doesn't filter headers",
+        "skip": true
+      },
       "request-referrer.any.js": {
         "note": "TODO(@KhafraDev): url referrer test could probably be fixed",
         "fail": [
diff --git a/test/wpt/tests/.azure-pipelines.yml b/test/wpt/tests/.azure-pipelines.yml
index 75a87df90f0..1a21d2f7a00 100644
--- a/test/wpt/tests/.azure-pipelines.yml
+++ b/test/wpt/tests/.azure-pipelines.yml
@@ -100,9 +100,6 @@ jobs:
     inputs:
       versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_fonts.yml
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/color_profile.yml
@@ -144,8 +141,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      # TODO(#40525): Revert back to 3.7 once the Mac agent's Python v3.7 contains bz2 again.
-      versionSpec: '3.7.16'
+      versionSpec: '3.7'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
@@ -177,8 +173,7 @@ jobs:
   steps:
   - task: UsePythonVersion@0
     inputs:
-      # TODO(#40525): Revert back to 3.7 once the Mac agent's Python v3.7 contains bz2 again.
-      versionSpec: '3.7.16'
+      versionSpec: '3.7'
   - template: tools/ci/azure/checkout.yml
   - template: tools/ci/azure/tox_pytest.yml
     parameters:
@@ -211,8 +206,7 @@ jobs:
   # full checkout required
   - task: UsePythonVersion@0
     inputs:
-      # TODO(#40525): Revert back to 3.7 once the Mac agent's Python v3.7 contains bz2 again.
-      versionSpec: '3.7.16'
+      versionSpec: '3.7'
   - template: tools/ci/azure/install_chrome.yml
   - template: tools/ci/azure/install_firefox.yml
   - template: tools/ci/azure/update_hosts.yml
@@ -373,9 +367,6 @@ jobs:
       versionSpec: '3.11'
   - template: tools/ci/azure/system_info.yml
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/install_edge.yml
     parameters:
@@ -412,9 +403,6 @@ jobs:
       versionSpec: '3.11'
   - template: tools/ci/azure/system_info.yml
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/install_edge.yml
     parameters:
@@ -450,9 +438,6 @@ jobs:
     inputs:
       versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/install_edge.yml
     parameters:
@@ -488,9 +473,6 @@ jobs:
     inputs:
       versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/color_profile.yml
   - template: tools/ci/azure/install_safari.yml
@@ -531,9 +513,6 @@ jobs:
     inputs:
       versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/color_profile.yml
   - template: tools/ci/azure/install_safari.yml
@@ -571,9 +550,6 @@ jobs:
     inputs:
       versionSpec: '3.11'
   - template: tools/ci/azure/checkout.yml
-  - template: tools/ci/azure/pip_install.yml
-    parameters:
-      packages: virtualenv
   - template: tools/ci/azure/install_certs.yml
   - template: tools/ci/azure/color_profile.yml
   - template: tools/ci/azure/update_hosts.yml
diff --git a/test/wpt/tests/.taskcluster.yml b/test/wpt/tests/.taskcluster.yml
index c817999b8e6..2a005df772f 100644
--- a/test/wpt/tests/.taskcluster.yml
+++ b/test/wpt/tests/.taskcluster.yml
@@ -7,7 +7,7 @@ tasks:
     run_task:
       $if: 'tasks_for == "github-push"'
       then:
-        $if: 'event.ref in ["refs/heads/master", "refs/heads/epochs/daily", "refs/heads/epochs/weekly", "refs/heads/triggers/chrome_stable", "refs/heads/triggers/chrome_beta", "refs/heads/triggers/chrome_dev", "refs/heads/triggers/chrome_nightly", "refs/heads/triggers/firefox_stable", "refs/heads/triggers/firefox_beta", "refs/heads/triggers/firefox_nightly", "refs/heads/triggers/webkitgtk_minibrowser_stable", "refs/heads/triggers/webkitgtk_minibrowser_beta", "refs/heads/triggers/webkitgtk_minibrowser_nightly", "refs/heads/triggers/servo_nightly"]'
+        $if: 'event.ref in ["refs/heads/master", "refs/heads/epochs/daily", "refs/heads/epochs/weekly", "refs/heads/triggers/chrome_stable", "refs/heads/triggers/chrome_beta", "refs/heads/triggers/chrome_dev", "refs/heads/triggers/chrome_nightly", "refs/heads/triggers/firefox_stable", "refs/heads/triggers/firefox_beta", "refs/heads/triggers/firefox_nightly", "refs/heads/triggers/firefox_android_nightly", "refs/heads/triggers/webkitgtk_minibrowser_stable", "refs/heads/triggers/webkitgtk_minibrowser_beta", "refs/heads/triggers/webkitgtk_minibrowser_nightly", "refs/heads/triggers/servo_nightly"]'
         then: true
         else: false
       else:
@@ -57,7 +57,7 @@ tasks:
             owner: ${owner}
             source: ${event.repository.clone_url}
           payload:
-            image: webplatformtests/wpt:0.54
+            image: webplatformtests/wpt:0.55
             maxRunTime: 7200
             artifacts:
               public/results:
diff --git a/test/wpt/tests/FileAPI/META.yml b/test/wpt/tests/FileAPI/META.yml
index 506a59fec1e..66227c8224b 100644
--- a/test/wpt/tests/FileAPI/META.yml
+++ b/test/wpt/tests/FileAPI/META.yml
@@ -1,6 +1,6 @@
 spec: https://w3c.github.io/FileAPI/
 suggested_reviewers:
   - inexorabletash
-  - zqzhang
   - jdm
   - mkruisselbrink
+  - annevk
diff --git a/test/wpt/tests/FileAPI/blob/Blob-stream.any.js b/test/wpt/tests/FileAPI/blob/Blob-stream.any.js
index 87710a171a9..453144cac96 100644
--- a/test/wpt/tests/FileAPI/blob/Blob-stream.any.js
+++ b/test/wpt/tests/FileAPI/blob/Blob-stream.any.js
@@ -70,7 +70,18 @@ promise_test(async() => {
   await garbageCollect();
   const chunks = await read_all_chunks(stream, { perform_gc: true });
   assert_array_equals(chunks, input_arr);
-}, "Blob.stream() garbage collection of blob shouldn't break stream" +
+}, "Blob.stream() garbage collection of blob shouldn't break stream " +
+      "consumption")
+
+promise_test(async() => {
+  const input_arr = [8, 241, 48, 123, 151];
+  const typed_arr = new Uint8Array(input_arr);
+  let blob = new Blob([typed_arr]);
+  const chunksPromise = read_all_chunks(blob.stream());
+  // It somehow matters to do GC here instead of doing `perform_gc: true`
+  await garbageCollect();
+  assert_array_equals(await chunksPromise, input_arr);
+}, "Blob.stream() garbage collection of stream shouldn't break stream " +
       "consumption")
 
 promise_test(async () => {
diff --git a/test/wpt/tests/common/META.yml b/test/wpt/tests/common/META.yml
index ca4d2e523c0..963dff9d1f1 100644
--- a/test/wpt/tests/common/META.yml
+++ b/test/wpt/tests/common/META.yml
@@ -1,3 +1,2 @@
 suggested_reviewers:
-  - zqzhang
   - deniak
diff --git a/test/wpt/tests/common/dispatcher/dispatcher.js b/test/wpt/tests/common/dispatcher/dispatcher.js
index a0f9f43e622..ce17a7c9145 100644
--- a/test/wpt/tests/common/dispatcher/dispatcher.js
+++ b/test/wpt/tests/common/dispatcher/dispatcher.js
@@ -1,7 +1,26 @@
 // Define a universal message passing API. It works cross-origin and across
 // browsing context groups.
 const dispatcher_path = "/common/dispatcher/dispatcher.py";
-const dispatcher_url = new URL(dispatcher_path, location.href).href;
+
+// Finds the nearest ancestor window that has a non srcdoc location. This should
+// give us a usable location for constructing further URLs.
+function findLocationFromAncestors(w) {
+  if (w.location.href == 'about:srcdoc') {
+    return findLocationFromAncestors(w.parent);
+  }
+  return w.location;
+}
+
+// Handles differences between workers vs frames (src vs srcdoc).
+function findLocation() {
+  if (location.href == 'about:srcdoc') {
+    return findLocationFromAncestors(window.parent);
+  }
+  return location;
+}
+
+const dispatcherLocation = findLocation();
+const dispatcher_url = new URL(dispatcher_path, dispatcherLocation).href;
 
 // Return a promise, limiting the number of concurrent accesses to a shared
 // resources to |max_concurrent_access|.
@@ -138,7 +157,7 @@ const cacheableShowRequestHeaders = function(origin, uuid) {
 //   protocol: (optional) Sets the returned URL's `protocol` property.
 // }
 function remoteExecutorUrl(uuid, options) {
-  const url = new URL("/common/dispatcher/remote-executor.html", location);
+  const url = new URL("/common/dispatcher/remote-executor.html", dispatcherLocation);
   url.searchParams.set("uuid", uuid);
 
   if (options?.host) {
diff --git a/test/wpt/tests/common/dummy.json b/test/wpt/tests/common/dummy.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/test/wpt/tests/common/dummy.json
@@ -0,0 +1 @@
+{}
diff --git a/test/wpt/tests/common/security-features/subresource/video.py b/test/wpt/tests/common/security-features/subresource/video.py
index 7cfbbfa68c8..9db8e9fbb5a 100644
--- a/test/wpt/tests/common/security-features/subresource/video.py
+++ b/test/wpt/tests/common/security-features/subresource/video.py
@@ -4,7 +4,7 @@
 subresource = importlib.import_module("common.security-features.subresource.subresource")
 
 def generate_payload(request, server_data):
-    file = os.path.join(request.doc_root, u"media", u"movie_5.ogv")
+    file = os.path.join(request.doc_root, u"media", u"movie_5.webm")
     return open(file, "rb").read()
 
 
@@ -14,4 +14,4 @@ def main(request, response):
                         response,
                         payload_generator = handler,
                         access_control_allow_origin = b"*",
-                        content_type = b"video/ogg")
+                        content_type = b"video/webm")
diff --git a/test/wpt/tests/common/top-layer.js b/test/wpt/tests/common/top-layer.js
new file mode 100644
index 00000000000..2dc8ce3893a
--- /dev/null
+++ b/test/wpt/tests/common/top-layer.js
@@ -0,0 +1,29 @@
+// This function is a version of test_driver.bless which works while there are
+// elements in the top layer:
+// https://github.com/web-platform-tests/wpt/issues/41218.
+// Pass it the element at the top of the top layer stack.
+window.blessTopLayer = async (topLayerElement) => {
+  const button = document.createElement('button');
+  topLayerElement.append(button);
+  let wait_click = new Promise(resolve => button.addEventListener("click", resolve, {once: true}));
+  await test_driver.click(button);
+  await wait_click;
+  button.remove();
+};
+
+window.isTopLayer = (el) => {
+  // A bit of a hack. Just test a few properties of the ::backdrop pseudo
+  // element that change when in the top layer.
+  const properties = ['right','background'];
+  const testEl = document.createElement('div');
+  document.body.appendChild(testEl);
+  const computedStyle = getComputedStyle(testEl, '::backdrop');
+  const nonTopLayerValues = properties.map(p => computedStyle[p]);
+  testEl.remove();
+  for(let i=0;i<properties.length;++i) {
+    if (getComputedStyle(el,'::backdrop')[properties[i]] !== nonTopLayerValues[i]) {
+      return true;
+    }
+  }
+  return false;
+};
diff --git a/test/wpt/tests/fetch/api/basic/request-forbidden-headers.any.js b/test/wpt/tests/fetch/api/basic/request-forbidden-headers.any.js
index 511ce601e7c..d7560f03a23 100644
--- a/test/wpt/tests/fetch/api/basic/request-forbidden-headers.any.js
+++ b/test/wpt/tests/fetch/api/basic/request-forbidden-headers.any.js
@@ -1,21 +1,6 @@
 // META: global=window,worker
 // META: script=../resources/utils.js
 
-function requestForbiddenHeaders(desc, forbiddenHeaders) {
-  var url = RESOURCES_DIR + "inspect-headers.py";
-  var requestInit = {"headers": forbiddenHeaders}
-  var urlParameters = "?headers=" + Object.keys(forbiddenHeaders).join("|");
-
-  promise_test(function(test){
-    return fetch(url + urlParameters, requestInit).then(function(resp) {
-      assert_equals(resp.status, 200, "HTTP status is 200");
-      assert_equals(resp.type , "basic", "Response's type is basic");
-      for (var header in forbiddenHeaders)
-        assert_not_equals(resp.headers.get("x-request-" + header), forbiddenHeaders[header], header + " does not have the value we defined");
-    });
-  }, desc);
-}
-
 function requestValidOverrideHeaders(desc, validHeaders) {
   var url = RESOURCES_DIR + "inspect-headers.py";
   var requestInit = {"headers": validHeaders}
@@ -36,9 +21,6 @@ requestForbiddenHeaders("Accept-Encoding is a forbidden request header", {"Accep
 
 requestForbiddenHeaders("Access-Control-Request-Headers is a forbidden request header", {"Access-Control-Request-Headers": ""});
 requestForbiddenHeaders("Access-Control-Request-Method is a forbidden request header", {"Access-Control-Request-Method": ""});
-requestForbiddenHeaders(
-    'Access-Control-Request-Private-Network is a forbidden request header',
-    {'Access-Control-Request-Private-Network': ''});
 requestForbiddenHeaders("Connection is a forbidden request header", {"Connection": "close"});
 requestForbiddenHeaders("Content-Length is a forbidden request header", {"Content-Length": "42"});
 requestForbiddenHeaders("Cookie is a forbidden request header", {"Cookie": "cookie=none"});
diff --git a/test/wpt/tests/fetch/api/basic/request-private-network-headers.tentative.any.js b/test/wpt/tests/fetch/api/basic/request-private-network-headers.tentative.any.js
new file mode 100644
index 00000000000..9662a91c177
--- /dev/null
+++ b/test/wpt/tests/fetch/api/basic/request-private-network-headers.tentative.any.js
@@ -0,0 +1,18 @@
+// META: global=window,worker
+// META: script=../resources/utils.js
+
+requestForbiddenHeaders(
+    'Access-Control-Request-Private-Network is a forbidden request header',
+    {'Access-Control-Request-Private-Network': ''});
+
+var invalidRequestHeaders = [
+  ["Access-Control-Request-Private-Network", "KO"],
+];
+
+invalidRequestHeaders.forEach(function(header) {
+  test(function() {
+    var request = new Request("");
+    request.headers.set(header[0], header[1]);
+    assert_equals(request.headers.get(header[0]), null);
+  }, "Adding invalid request header \"" + header[0] + ": " + header[1] + "\"");
+});
diff --git a/test/wpt/tests/fetch/api/basic/url-parsing.sub.html b/test/wpt/tests/fetch/api/basic/url-parsing.sub.html
new file mode 100644
index 00000000000..fa47b29473a
--- /dev/null
+++ b/test/wpt/tests/fetch/api/basic/url-parsing.sub.html
@@ -0,0 +1,33 @@
+<!-- Based on /html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html -->
+<!doctype html>
+<meta charset={{GET[encoding]}}> <!-- ends up as <meta charset> by default which is windows-1252 -->
+<meta name=variant content="?encoding=windows-1252">
+<meta name=variant content="?encoding=x-cp1251">
+<meta name=variant content="?encoding=utf8">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+function expected(encoding) {
+  return {
+    "UTF-8": "%C3%BF",
+    "windows-1251": "%26%23255%3B",
+    "windows-1252": "%FF"
+  }[encoding];
+}
+
+test(() => {
+  const request = new Request("?\u00FF");
+  assert_equals(request.url.split("?")[1], expected("UTF-8"));
+}, "Request uses the UTF-8 URL parser");
+
+test(() => {
+  const request = new Request("about:blank", { referrer: "?\u00FF" });
+  assert_equals(request.referrer.split("?")[1], expected("UTF-8"));
+}, "Request's referrer uses the UTF-8 URL parser");
+
+test(() => {
+  const response = Response.redirect("?\u00FF");
+  assert_equals(response.headers.get("Location").split("?")[1], expected("UTF-8"));
+}, "Response.redirect() uses the UTF-8 URL parser");
+</script>
diff --git a/test/wpt/tests/fetch/api/cors/cors-keepalive.any.js b/test/wpt/tests/fetch/api/cors/cors-keepalive.any.js
index f68d90ef9aa..08229f9cfc7 100644
--- a/test/wpt/tests/fetch/api/cors/cors-keepalive.any.js
+++ b/test/wpt/tests/fetch/api/cors/cors-keepalive.any.js
@@ -75,10 +75,10 @@ keepaliveCorsBasicTest(
 function keepaliveCorsInUnloadTest(description, origin, method) {
   const evt = 'unload';
   for (const mode of ['no-cors', 'cors']) {
-    for (const disallowOrigin of [false, true]) {
+    for (const disallowCrossOrigin of [false, true]) {
       const desc = `${description} ${method} request in ${evt} [${mode} mode` +
-          (disallowOrigin ? `, server forbid CORS]` : `]`);
-      const shouldPass = !disallowOrigin || mode === 'no-cors';
+          (disallowCrossOrigin ? ']' : ', server forbid CORS]');
+      const expectTokenExist = !disallowCrossOrigin || mode === 'no-cors';
       promise_test(async (test) => {
         const token1 = token();
         const iframe = document.createElement('iframe');
@@ -87,14 +87,14 @@ function keepaliveCorsInUnloadTest(description, origin, method) {
           requestOrigin: origin,
           sendOn: evt,
           mode: mode,
-          disallowOrigin
+          disallowCrossOrigin
         });
         document.body.appendChild(iframe);
         await iframeLoaded(iframe);
         iframe.remove();
         assert_equals(await getTokenFromMessage(), token1);
 
-        assertStashedTokenAsync(desc, token1, {shouldPass});
+        assertStashedTokenAsync(desc, token1, {expectTokenExist});
       }, `${desc}; setting up`);
     }
   }
diff --git a/test/wpt/tests/fetch/api/redirect/redirect-keepalive.any.js b/test/wpt/tests/fetch/api/redirect/redirect-keepalive.any.js
index bcfc444f5a6..beda8bb8e78 100644
--- a/test/wpt/tests/fetch/api/redirect/redirect-keepalive.any.js
+++ b/test/wpt/tests/fetch/api/redirect/redirect-keepalive.any.js
@@ -14,66 +14,6 @@ const {
   HTTP_REMOTE_ORIGIN_WITH_DIFFERENT_PORT
 } = get_host_info();
 
-/**
- * In an iframe, test to fetch a keepalive URL that involves in redirect to
- * another URL.
- */
-function keepaliveRedirectTest(
-    desc, {origin1 = '', origin2 = '', withPreflight = false} = {}) {
-  desc = `[keepalive] ${desc}`;
-  promise_test(async (test) => {
-    const tokenToStash = token();
-    const iframe = document.createElement('iframe');
-    iframe.src = getKeepAliveAndRedirectIframeUrl(
-        tokenToStash, origin1, origin2, withPreflight);
-    document.body.appendChild(iframe);
-    await iframeLoaded(iframe);
-    assert_equals(await getTokenFromMessage(), tokenToStash);
-    iframe.remove();
-
-    assertStashedTokenAsync(desc, tokenToStash);
-  }, `${desc}; setting up`);
-}
-
-/**
- * Opens a different site window, and in `unload` event handler, test to fetch
- * a keepalive URL that involves in redirect to another URL.
- */
-function keepaliveRedirectInUnloadTest(desc, {
-  origin1 = '',
-  origin2 = '',
-  url2 = '',
-  withPreflight = false,
-  shouldPass = true
-} = {}) {
-  desc = `[keepalive][new window][unload] ${desc}`;
-
-  promise_test(async (test) => {
-    const targetUrl =
-        `${HTTP_NOTSAMESITE_ORIGIN}/fetch/api/resources/keepalive-redirect-window.html?` +
-        `origin1=${origin1}&` +
-        `origin2=${origin2}&` +
-        `url2=${url2}&` + (withPreflight ? `with-headers` : ``);
-    const w = window.open(targetUrl);
-    const token = await getTokenFromMessage();
-    w.close();
-
-    assertStashedTokenAsync(desc, token, {shouldPass});
-  }, `${desc}; setting up`);
-}
-
-keepaliveRedirectTest(`same-origin redirect`);
-keepaliveRedirectTest(
-    `same-origin redirect + preflight`, {withPreflight: true});
-keepaliveRedirectTest(`cross-origin redirect`, {
-  origin1: HTTP_REMOTE_ORIGIN,
-  origin2: HTTP_REMOTE_ORIGIN_WITH_DIFFERENT_PORT
-});
-keepaliveRedirectTest(`cross-origin redirect + preflight`, {
-  origin1: HTTP_REMOTE_ORIGIN,
-  origin2: HTTP_REMOTE_ORIGIN_WITH_DIFFERENT_PORT,
-  withPreflight: true
-});
 
 keepaliveRedirectInUnloadTest('same-origin redirect');
 keepaliveRedirectInUnloadTest(
@@ -88,7 +28,9 @@ keepaliveRedirectInUnloadTest('cross-origin redirect + preflight', {
   withPreflight: true
 });
 keepaliveRedirectInUnloadTest(
-    'redirect to file URL', {url2: 'file://tmp/bar.txt', shouldPass: false});
-keepaliveRedirectInUnloadTest(
-    'redirect to data URL',
-    {url2: 'data:text/plain;base64,cmVzcG9uc2UncyBib2R5', shouldPass: false});
+    'redirect to file URL',
+    {url2: 'file://tmp/bar.txt', expectFetchSucceed: false});
+keepaliveRedirectInUnloadTest('redirect to data URL', {
+  url2: 'data:text/plain;base64,cmVzcG9uc2UncyBib2R5',
+  expectFetchSucceed: false
+});
diff --git a/test/wpt/tests/fetch/api/redirect/redirect-keepalive.https.any.js b/test/wpt/tests/fetch/api/redirect/redirect-keepalive.https.any.js
new file mode 100644
index 00000000000..6765ecac6d7
--- /dev/null
+++ b/test/wpt/tests/fetch/api/redirect/redirect-keepalive.https.any.js
@@ -0,0 +1,20 @@
+// META: global=window
+// META: title=Fetch API: keepalive handling
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/utils.js
+// META: script=/common/get-host-info.sub.js
+// META: script=../resources/keepalive-helper.js
+
+'use strict';
+
+const {
+  HTTP_NOTSAMESITE_ORIGIN,
+  HTTPS_NOTSAMESITE_ORIGIN,
+} = get_host_info();
+
+keepaliveRedirectTest(`mixed content redirect`, {
+  origin1: HTTPS_NOTSAMESITE_ORIGIN,
+  origin2: HTTP_NOTSAMESITE_ORIGIN,
+  expectFetchSucceed: false
+});
diff --git a/test/wpt/tests/fetch/api/request/destination/fetch-destination.https.html b/test/wpt/tests/fetch/api/request/destination/fetch-destination.https.html
index 0094b0b6fe8..1b6cf169141 100644
--- a/test/wpt/tests/fetch/api/request/destination/fetch-destination.https.html
+++ b/test/wpt/tests/fetch/api/request/destination/fetch-destination.https.html
@@ -194,6 +194,40 @@
   });
 }, 'HTMLLinkElement with rel=stylesheet fetches with a "style" Request.destination');
 
+// Import declaration with `type: "css"` - style destination
+promise_test(t => {
+  return new Promise((resolve, reject) => {
+      frame.contentWindow.onerror = reject;
+
+      let node = frame.contentWindow.document.createElement("script");
+      node.onload = resolve;
+      node.onerror = reject;
+      node.src = "import-declaration-type-css.js";
+      node.type = "module";
+      frame.contentWindow.document.body.appendChild(node);
+  }).then(() => {
+    frame.contentWindow.onerror = null;
+  });
+}, 'Import declaration with `type: "css"` fetches with a "style" Request.destination');
+
+// JSON destination
+///////////////////
+
+// Import declaration with `type: "json"` - json destination
+promise_test(t => {
+  return new Promise((resolve, reject) => {
+      frame.contentWindow.onerror = reject;
+      let node = frame.contentWindow.document.createElement("script");
+      node.onload = resolve;
+      node.onerror = reject;
+      node.src = "import-declaration-type-json.js";
+      node.type = "module";
+      frame.contentWindow.document.body.appendChild(node);
+  }).then(() => {
+    frame.contentWindow.onerror = null;
+  });
+}, 'Import declaration with `type: "json"` fetches with a "json" Request.destination');
+
 // Preload tests
 ////////////////
 // HTMLLinkElement with rel=preload and as=fetch - empty string destination
@@ -232,6 +266,22 @@
   });
 }, 'HTMLLinkElement with rel=preload and as=style fetches with a "style" Request.destination');
 
+// HTMLLinkElement with rel=preload and as=json - json destination
+promise_test(t => {
+  return new Promise((resolve, reject) => {
+      let node = frame.contentWindow.document.createElement("link");
+      node.rel = "preload";
+      node.as = "json";
+      if (node.as != "json") {
+        resolve();
+      }
+      node.onload = resolve;
+      node.onerror = reject;
+      node.href = "dummy.json?t=2&dest=json";
+      frame.contentWindow.document.body.appendChild(node);
+  });
+}, 'HTMLLinkElement with rel=preload and as=json fetches with a "json" Request.destination');
+
 // HTMLLinkElement with rel=preload and as=script - script destination
 promise_test(async t => {
   await new Promise((resolve, reject) => {
diff --git a/test/wpt/tests/fetch/api/request/destination/resources/dummy.css b/test/wpt/tests/fetch/api/request/destination/resources/dummy.css
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/wpt/tests/fetch/api/request/destination/resources/dummy.json b/test/wpt/tests/fetch/api/request/destination/resources/dummy.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/test/wpt/tests/fetch/api/request/destination/resources/dummy.json
@@ -0,0 +1 @@
+{}
diff --git a/test/wpt/tests/fetch/api/request/destination/resources/import-declaration-type-css.js b/test/wpt/tests/fetch/api/request/destination/resources/import-declaration-type-css.js
new file mode 100644
index 00000000000..3c8cf1f44b7
--- /dev/null
+++ b/test/wpt/tests/fetch/api/request/destination/resources/import-declaration-type-css.js
@@ -0,0 +1 @@
+import "./dummy.css?dest=style" with { type: "css" };
diff --git a/test/wpt/tests/fetch/api/request/destination/resources/import-declaration-type-json.js b/test/wpt/tests/fetch/api/request/destination/resources/import-declaration-type-json.js
new file mode 100644
index 00000000000..b2d964dd824
--- /dev/null
+++ b/test/wpt/tests/fetch/api/request/destination/resources/import-declaration-type-json.js
@@ -0,0 +1 @@
+import "./dummy.json?dest=json" with { type: "json" };
diff --git a/test/wpt/tests/fetch/api/request/request-headers.any.js b/test/wpt/tests/fetch/api/request/request-headers.any.js
index 22925e01b69..a766bcb5fff 100644
--- a/test/wpt/tests/fetch/api/request/request-headers.any.js
+++ b/test/wpt/tests/fetch/api/request/request-headers.any.js
@@ -18,7 +18,6 @@ var invalidRequestHeaders = [
   ["Accept-Encoding", "KO"],
   ["Access-Control-Request-Headers", "KO"],
   ["Access-Control-Request-Method", "KO"],
-  ["Access-Control-Request-Private-Network", "KO"],
   ["Connection", "KO"],
   ["Content-Length", "KO"],
   ["Cookie", "KO"],
diff --git a/test/wpt/tests/fetch/api/resources/keepalive-helper.js b/test/wpt/tests/fetch/api/resources/keepalive-helper.js
index ad1d4b2c7c3..f6f511631e5 100644
--- a/test/wpt/tests/fetch/api/resources/keepalive-helper.js
+++ b/test/wpt/tests/fetch/api/resources/keepalive-helper.js
@@ -11,14 +11,14 @@
 // `sendOn` to specify the name of the event when the keepalive request should
 // be sent instead of the default 'load'.
 // `mode` to specify the fetch request's CORS mode.
-// `disallowOrigin` to ask the iframe to set up a server that forbids CORS
-// requests.
+// `disallowCrossOrigin` to ask the iframe to set up a server that disallows
+// cross origin requests.
 function getKeepAliveIframeUrl(token, method, {
   frameOrigin = 'DEFAULT',
   requestOrigin = '',
   sendOn = 'load',
   mode = 'cors',
-  disallowOrigin = false
+  disallowCrossOrigin = false
 } = {}) {
   const https = location.protocol.startsWith('https');
   frameOrigin = frameOrigin === 'DEFAULT' ?
@@ -28,7 +28,7 @@ function getKeepAliveIframeUrl(token, method, {
       `token=${token}&` +
       `method=${method}&` +
       `sendOn=${sendOn}&` +
-      `mode=${mode}&` + (disallowOrigin ? `disallowOrigin=1&` : ``) +
+      `mode=${mode}&` + (disallowCrossOrigin ? `disallowCrossOrigin=1&` : ``) +
       `origin=${requestOrigin}`;
 }
 
@@ -72,28 +72,105 @@ async function queryToken(token) {
   return json;
 }
 
+// A helper to assert the existence of `token` that should have been stored in
+// the server by fetching ../resources/stash-put.py.
+//
+// This function simply wait for a custom amount of time before trying to
+// retrieve `token` from the server.
+// `expectTokenExist` tells if `token` should be present or not.
+//
+// NOTE:
 // In order to parallelize the work, we are going to have an async_test
 // for the rest of the work. Note that we want the serialized behavior
 // for the steps so far, so we don't want to make the entire test case
 // an async_test.
-function assertStashedTokenAsync(testName, token, {shouldPass = true} = {}) {
-  async_test((test) => {
-    new Promise((resolve) => test.step_timeout(resolve, 3000))
-        .then(() => {
+function assertStashedTokenAsync(
+    testName, token, {expectTokenExist = true} = {}) {
+  async_test(test => {
+    new Promise(resolve => test.step_timeout(resolve, 3000 /*ms*/))
+        .then(test.step_func(() => {
           return queryToken(token);
-        })
-        .then((result) => {
-          assert_equals(result, 'on');
-        })
-        .then(() => {
-          test.done();
-        })
-        .catch(test.step_func((e) => {
-          if (shouldPass) {
-            assert_unreached(e);
+        }))
+        .then(test.step_func(result => {
+          if (expectTokenExist) {
+            assert_equals(result, 'on', `token should be on (stashed).`);
+            test.done();
+          } else {
+            assert_not_equals(
+                result, 'on', `token should not be on (stashed).`);
+            return Promise.reject(`Failed to retrieve token from server`);
+          }
+        }))
+        .catch(test.step_func(e => {
+          if (expectTokenExist) {
+            test.unreached_func(e);
           } else {
             test.done();
           }
         }));
   }, testName);
 }
+
+/**
+ * In an iframe, and in `load` event handler, test to fetch a keepalive URL that
+ * involves in redirect to another URL.
+ *
+ * `unloadIframe` to unload the iframe before verifying stashed token to
+ * simulate the situation that unloads after fetching. Note that this test is
+ * different from `keepaliveRedirectInUnloadTest()` in that the the latter
+ * performs fetch() call directly in `unload` event handler, while this test
+ * does it in `load`.
+ */
+function keepaliveRedirectTest(desc, {
+  origin1 = '',
+  origin2 = '',
+  withPreflight = false,
+  unloadIframe = false,
+  expectFetchSucceed = true,
+} = {}) {
+  desc = `[keepalive][iframe][load] ${desc}` +
+      (unloadIframe ? ' [unload at end]' : '');
+  promise_test(async (test) => {
+    const tokenToStash = token();
+    const iframe = document.createElement('iframe');
+    iframe.src = getKeepAliveAndRedirectIframeUrl(
+        tokenToStash, origin1, origin2, withPreflight);
+    document.body.appendChild(iframe);
+    await iframeLoaded(iframe);
+    assert_equals(await getTokenFromMessage(), tokenToStash);
+    if (unloadIframe) {
+      iframe.remove();
+    }
+
+    assertStashedTokenAsync(
+        desc, tokenToStash, {expectTokenExist: expectFetchSucceed});
+  }, `${desc}; setting up`);
+}
+
+/**
+ * Opens a different site window, and in `unload` event handler, test to fetch
+ * a keepalive URL that involves in redirect to another URL.
+ */
+function keepaliveRedirectInUnloadTest(desc, {
+  origin1 = '',
+  origin2 = '',
+  url2 = '',
+  withPreflight = false,
+  expectFetchSucceed = true
+} = {}) {
+  desc = `[keepalive][new window][unload] ${desc}`;
+
+  promise_test(async (test) => {
+    const targetUrl =
+        `${HTTP_NOTSAMESITE_ORIGIN}/fetch/api/resources/keepalive-redirect-window.html?` +
+        `origin1=${origin1}&` +
+        `origin2=${origin2}&` +
+        `url2=${url2}&` + (withPreflight ? `with-headers` : ``);
+    const w = window.open(targetUrl);
+    const token = await getTokenFromMessage();
+    w.close();
+
+    assertStashedTokenAsync(
+        desc, token, {expectTokenExist: expectFetchSucceed});
+  }, `${desc}; setting up`);
+}
diff --git a/test/wpt/tests/fetch/api/resources/keepalive-iframe.html b/test/wpt/tests/fetch/api/resources/keepalive-iframe.html
index 335a1f8e318..f9dae5a34ec 100644
--- a/test/wpt/tests/fetch/api/resources/keepalive-iframe.html
+++ b/test/wpt/tests/fetch/api/resources/keepalive-iframe.html
@@ -4,14 +4,15 @@
 <script>
 const SEARCH_PARAMS = new URL(location.href).searchParams;
 const ORIGIN = SEARCH_PARAMS.get('origin') || '';
+const FRAME_ORIGIN = new URL(location.href).origin;
 const TOKEN = SEARCH_PARAMS.get('token') || '';
 const METHOD = SEARCH_PARAMS.get('method') || 'GET';
 const SEND_ON_EVENT = SEARCH_PARAMS.get('sendOn') || 'load';
 const MODE = SEARCH_PARAMS.get('mode') || 'cors';
-const DISALLOW_ORIGIN = SEARCH_PARAMS.get('disallow_origin') || '';
+const DISALLOW_CROSS_ORIGIN = SEARCH_PARAMS.get('disallowCrossOrigin') || '';
 // CORS requests are allowed by this URL by default.
-const url = `${ORIGIN}/fetch/api/resources/stash-put.py?key=${TOKEN}&value=on` +
-(DISALLOW_ORIGIN ? `&disallow_origin=1` : '');
+const url = `${ORIGIN}/fetch/api/resources/stash-put.py?key=${TOKEN}&value=on&mode=${MODE}`
+    + `&frame_origin=${FRAME_ORIGIN}` + (DISALLOW_CROSS_ORIGIN ? `&disallow_cross_origin=1` : '');
 
 addEventListener(SEND_ON_EVENT, () => {
   let p = fetch(url, {keepalive: true, method: METHOD, mode: MODE});
diff --git a/test/wpt/tests/fetch/api/resources/stash-put.py b/test/wpt/tests/fetch/api/resources/stash-put.py
index 0530e1ba5b4..91c198abb7d 100644
--- a/test/wpt/tests/fetch/api/resources/stash-put.py
+++ b/test/wpt/tests/fetch/api/resources/stash-put.py
@@ -1,5 +1,20 @@
 from wptserve.utils import isomorphic_decode
 
+def should_be_treated_as_same_origin_request(request):
+  """Tells whether request should be treated as same-origin request."""
+  # In both of the following cases, allow to proceed with handling to simulate
+  # 'no-cors' mode: response is sent, but browser will make it opaque.
+  if request.GET.first(b'mode') == b'no-cors':
+    return True
+
+  # We can't rely on the Origin header field of a fetch request, as it is only
+  # present for 'cors' mode or methods other than 'GET'/'HEAD' (i.e. present for
+  # 'POST'). See https://fetch.spec.whatwg.org/#http-origin
+  assert 'frame_origin ' in request.GET
+  frame_origin = request.GET.first(b'frame_origin').decode('utf-8')
+  host_origin = request.url_parts.scheme + '://' + request.url_parts.netloc
+  return frame_origin == host_origin
+
 def main(request, response):
   if request.method == u'OPTIONS':
     # CORS preflight
@@ -8,12 +23,19 @@ def main(request, response):
     response.headers.set(b'Access-Control-Allow-Headers', b'*')
     return 'done'
 
+  if b'disallow_cross_origin' not in request.GET:
+    response.headers.set(b'Access-Control-Allow-Origin', b'*')
+  elif not should_be_treated_as_same_origin_request(request):
+    # As simple requests will not trigger preflight, we have to manually block
+    # cors requests before making any changes to storage.
+    # https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS#simple_requests
+    # https://fetch.spec.whatwg.org/#cors-preflight-fetch
+    return 'not stashing for cors request'
+
   url_dir = u'/'.join(request.url_parts.path.split(u'/')[:-1]) + u'/'
   key = request.GET.first(b'key')
   value = request.GET.first(b'value')
   # value here must be a text string. It will be json.dump()'ed in stash-take.py.
   request.server.stash.put(key, isomorphic_decode(value), url_dir)
 
-  if b'disallow_origin' not in request.GET:
-    response.headers.set(b'Access-Control-Allow-Origin', b'*')
   return 'done'
diff --git a/test/wpt/tests/fetch/api/resources/utils.js b/test/wpt/tests/fetch/api/resources/utils.js
index 3b20ecc8346..3721d9bf9cc 100644
--- a/test/wpt/tests/fetch/api/resources/utils.js
+++ b/test/wpt/tests/fetch/api/resources/utils.js
@@ -103,3 +103,18 @@ function delay(milliseconds)
     step_timeout(resolve, milliseconds);
   });
 }
+
+function requestForbiddenHeaders(desc, forbiddenHeaders) {
+  var url = RESOURCES_DIR + "inspect-headers.py";
+  var requestInit = {"headers": forbiddenHeaders}
+  var urlParameters = "?headers=" + Object.keys(forbiddenHeaders).join("|");
+
+  promise_test(function(test){
+    return fetch(url + urlParameters, requestInit).then(function(resp) {
+      assert_equals(resp.status, 200, "HTTP status is 200");
+      assert_equals(resp.type , "basic", "Response's type is basic");
+      for (var header in forbiddenHeaders)
+        assert_not_equals(resp.headers.get("x-request-" + header), forbiddenHeaders[header], header + " does not have the value we defined");
+    });
+  }, desc);
+}
diff --git a/test/wpt/tests/fetch/api/response/response-consume-stream.any.js b/test/wpt/tests/fetch/api/response/response-consume-stream.any.js
index befce620a3f..f89d7341ac6 100644
--- a/test/wpt/tests/fetch/api/response/response-consume-stream.any.js
+++ b/test/wpt/tests/fetch/api/response/response-consume-stream.any.js
@@ -59,3 +59,22 @@ test(function() {
 test(function() {
     assert_equals(Response.redirect("/").body, null);
 }, "Getting a redirect Response stream");
+
+promise_test(async function(test) {
+  var buffer = new ArrayBuffer(textData.length);
+
+  var body = new Response(textData).body;
+  const reader = body.getReader( {mode: 'byob'} );
+
+  let offset = 3;
+  while (offset < textData.length) {
+    const {done, value} = await reader.read(new Uint8Array(buffer, offset));
+    if (done) {
+      break;
+    }
+    buffer = value.buffer;
+    offset += value.byteLength;
+  }
+
+  validateBufferFromString(buffer, `\0\0\0\"This is response's bo`, 'Buffer should be validated');
+}, `Reading with offset from Response stream`);
diff --git a/test/wpt/tests/fetch/api/response/response-headers-guard.any.js b/test/wpt/tests/fetch/api/response/response-headers-guard.any.js
new file mode 100644
index 00000000000..4a67d067a71
--- /dev/null
+++ b/test/wpt/tests/fetch/api/response/response-headers-guard.any.js
@@ -0,0 +1,8 @@
+// META: global=window,worker
+// META: title=Response: error static method
+
+promise_test (async () => {
+  const response = await fetch("../resources/data.json");
+  assert_throws_js(TypeError, () => { response.headers.append("name", "value"); });
+  assert_not_equals(response.headers.get("name"), "value", "response headers should be immutable");
+}, "Ensure response headers are immutable");
diff --git a/test/wpt/tests/fetch/api/response/response-static-error.any.js b/test/wpt/tests/fetch/api/response/response-static-error.any.js
index 1f8c49ab006..4097eab37b4 100644
--- a/test/wpt/tests/fetch/api/response/response-static-error.any.js
+++ b/test/wpt/tests/fetch/api/response/response-static-error.any.js
@@ -11,18 +11,6 @@ test(function() {
   assert_true(responseError.headers.entries().next().done, "Headers should be empty");
 }, "Check response returned by static method error()");
 
-promise_test (async function() {
-  let response = await fetch("../resources/data.json");
-
-  try {
-    response.headers.append('name', 'value');
-  } catch (e) {
-    assert_equals(e.constructor.name, "TypeError");
-  }
-
-  assert_not_equals(response.headers.get("name"), "value", "response headers should be immutable");
-}, "Ensure response headers are immutable");
-
 test(function() {
   const headers = Response.error().headers;
 
diff --git a/test/wpt/tests/fetch/content-encoding/big-gzip-body.https.any.js b/test/wpt/tests/fetch/content-encoding/big-gzip-body.https.any.js
new file mode 100644
index 00000000000..b5d62c98045
--- /dev/null
+++ b/test/wpt/tests/fetch/content-encoding/big-gzip-body.https.any.js
@@ -0,0 +1,55 @@
+// META: global=window,worker
+
+const EXPECTED_SIZE = 27000000;
+const EXPECTED_SHA256 = [
+    74,  100, 37, 243, 147, 61,  116, 60,  241, 221, 126,
+    18,  24,  71, 204, 28,  50,  62,  201, 130, 152, 225,
+    217, 183, 10, 201, 143, 214, 102, 155, 212, 248,
+  ];
+
+promise_test(async () => {
+  const response = await fetch('resources/big.text.gz');
+  assert_true(response.ok);
+  const arrayBuffer = await response.arrayBuffer();
+  assert_equals(arrayBuffer.byteLength, EXPECTED_SIZE,
+               'uncompressed size should match');
+  const sha256 = await crypto.subtle.digest('SHA-256', arrayBuffer);
+  assert_array_equals(new Uint8Array(sha256), EXPECTED_SHA256,
+                      'digest should match');
+}, 'large gzip data should be decompressed successfully');
+
+promise_test(async () => {
+  const response = await fetch('resources/big.text.gz');
+  assert_true(response.ok);
+  const reader = response.body.getReader({mode: 'byob'});
+  let offset = 0;
+  // Pre-allocate space for the output. The response body will be read
+  // chunk-by-chunk into this array.
+  let ab = new ArrayBuffer(EXPECTED_SIZE);
+  while (offset < EXPECTED_SIZE) {
+    // To stress the data pipe, we want to use a different size read each
+    // time. Unfortunately, JavaScript doesn't have a seeded random number
+    // generator, so this creates the possibility of making this test flaky if
+    // it doesn't work for some edge cases.
+    let size = Math.floor(Math.random() * 65535 + 1);
+    if (size + offset > EXPECTED_SIZE) {
+      size = EXPECTED_SIZE - offset;
+    }
+    const u8 = new Uint8Array(ab, offset, size);
+    const { value, done } = await reader.read(u8);
+    ab = value.buffer;
+    // Check that we got our original array back.
+    assert_equals(ab.byteLength, EXPECTED_SIZE,
+                  'backing array should be the same size');
+    assert_equals(offset, value.byteOffset, 'offset should match');
+    assert_less_than_equal(value.byteLength, size,
+                           'we should not have got more than we asked for');
+    offset = value.byteOffset + value.byteLength;
+    if (done) break;
+  }
+  assert_equals(offset, EXPECTED_SIZE,
+                'we should have read the whole thing');
+  const sha256 = await crypto.subtle.digest('SHA-256', new Uint8Array(ab));
+  assert_array_equals(new Uint8Array(sha256), EXPECTED_SHA256,
+                      'digest should match');
+}, 'large gzip data should be decompressed successfully with byte stream');
diff --git a/test/wpt/tests/fetch/content-encoding/resources/big.text.gz b/test/wpt/tests/fetch/content-encoding/resources/big.text.gz
new file mode 100644
index 0000000000000000000000000000000000000000..13441bc3998353922eb25ea5b8ef535321b49b6b
GIT binary patch
literal 65509
zcmeI)JxfAy6bImI8t5X_76b)F;MCj@u3|$Vwgi2Ehz6(7p<JA7yjxI{Ls9fX(x5}Q
zxwHfZfqj9R8UnE}yq_VPo;#fN!ta01bGEZkPX^;}D*n-Zh*cMZ;HJNNdyr_o40CrY
z;a2~CCwu(dzASB&vrq4bZ`a9urV$nt8R!FJfC3Vdkc1>8Aqh!HLK2dYgd`*(2}wvo
z5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*(2}wvo5|WUFBqSjT
zNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2ej?<71wTVGp_4g`LVnoGsKt7dOok%2xi
z1}GpQ2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*(2}wvo
z5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dYgd`*(2}wvo5|WUFBqSjT
zCn;g)bbdBE1~?eK&Rk6LPu@|wHkyrQqmht=BqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8
zAqh!HLK2dYgd`*(2}wvo5|WUFBqSjTNk~Exl8}TXBq0e&NJ0{lkc1>8Aqh!HLK2dY
zgd`*(2}wvo5|WUFBqSjTNk~Exl8}Uvgu9#R)c6=+;^%1pD_#r>`AkERfj%$>C?FvT
cNk~Exl8}TXBq0g^S;ES6ZElcz{62~O0<KltzyJUM

literal 0
HcmV?d00001

diff --git a/test/wpt/tests/fetch/content-encoding/resources/big.text.gz.headers b/test/wpt/tests/fetch/content-encoding/resources/big.text.gz.headers
new file mode 100644
index 00000000000..55d2345c239
--- /dev/null
+++ b/test/wpt/tests/fetch/content-encoding/resources/big.text.gz.headers
@@ -0,0 +1,3 @@
+Content-type: text/plain
+Content-Encoding: gzip
+Cache-Control: no-store
diff --git a/test/wpt/tests/fetch/fetch-later/activate-after.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/activate-after.tentative.https.window.js
new file mode 100644
index 00000000000..08750dd3fe4
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/activate-after.tentative.https.window.js
@@ -0,0 +1,55 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+// META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+
+  // Loads an iframe that creates a fetchLater request w/ short timeout.
+  const iframe = await loadScriptAsIframe(`
+    fetchLater("${url}", {activateAfter: 1000});  // 1s
+  `);
+  // Deletes the iframe to trigger deferred request sending.
+  document.body.removeChild(iframe);
+
+  // The iframe should have sent all requests.
+  await expectBeacon(uuid, {count: 1});
+}, 'fetchLater() sends out based on activateAfter.');
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  // Sets no option to test the default behavior when a document enters BFCache.
+  const helper = new RemoteContextHelper();
+  // Opens a window with noopener so that BFCache will work.
+  const rc1 = await helper.addWindow(
+      /*config=*/ null, /*options=*/ {features: 'noopener'});
+
+  // Creates a fetchLater request with short timeout. It should be sent out
+  // even if the document is then put into BFCache.
+  await rc1.executeScript(url => {
+    fetchLater(url, {activateAfter: 1000});  // 1s.
+    // Add a pageshow listener to stash the BFCache event.
+    window.addEventListener('pageshow', e => {
+      window.pageshowEvent = e;
+    });
+  }, [url]);
+  // Navigates away to let page enter BFCache.
+  const rc2 = await rc1.navigateToNew();
+  // Navigate back.
+  await rc2.historyBack();
+  // Verify that the page was BFCached.
+  assert_true(await rc1.executeScript(() => {
+    return window.pageshowEvent.persisted;
+  }));
+
+  await expectBeacon(uuid, {count: 1});
+}, 'fetchLater() sends out based on activateAfter, even if document is in BFCache.');
diff --git a/test/wpt/tests/fetch/fetch-later/basic.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/basic.tentative.https.window.js
index a8ca011a7c9..bf92716681e 100644
--- a/test/wpt/tests/fetch/fetch-later/basic.tentative.https.window.js
+++ b/test/wpt/tests/fetch/fetch-later/basic.tentative.https.window.js
@@ -7,7 +7,43 @@ test(() => {
   assert_throws_js(TypeError, () => fetchLater());
 }, `fetchLater() cannot be called without request.`);
 
+test(() => {
+  assert_throws_js(TypeError, () => fetchLater('http://www.google.com'));
+  assert_throws_js(TypeError, () => fetchLater('file://tmp'));
+  assert_throws_js(TypeError, () => fetchLater('ssh://example.com'));
+  assert_throws_js(TypeError, () => fetchLater('wss://example.com'));
+  assert_throws_js(TypeError, () => fetchLater('about:blank'));
+  assert_throws_js(TypeError, () => fetchLater(`javascript:alert('');`));
+}, `fetchLater() throws TypeError on non-HTTPS URL.`);
+
+test(() => {
+  assert_throws_js(
+      RangeError,
+      () => fetchLater('https://www.google.com', {activateAfter: -1}));
+}, `fetchLater() throws RangeError on negative activateAfter.`);
+
 test(() => {
   const result = fetchLater('/');
-  assert_false(result.sent);
+  assert_false(result.activated);
 }, `fetchLater()'s return tells the deferred request is not yet sent.`);
+
+test(() => {
+  const result = fetchLater('/');
+  assert_throws_js(TypeError, () => result.activated = true);
+}, `fetchLater() throws TypeError when mutating its returned state.`);
+
+test(() => {
+  const controller = new AbortController();
+  // Immediately aborts the controller.
+  controller.abort();
+  assert_throws_dom(
+      'AbortError', () => fetchLater('/', {signal: controller.signal}));
+}, `fetchLater() throws AbortError when its initial abort signal is aborted.`);
+
+test(() => {
+  const controller = new AbortController();
+  const result = fetchLater('/', {signal: controller.signal});
+  assert_false(result.activated);
+  controller.abort();
+  assert_false(result.activated);
+}, `fetchLater() does not throw error when it is aborted before sending.`);
diff --git a/test/wpt/tests/fetch/fetch-later/basic.tentative.https.worker.js b/test/wpt/tests/fetch/fetch-later/basic.tentative.https.worker.js
new file mode 100644
index 00000000000..17240db3543
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/basic.tentative.https.worker.js
@@ -0,0 +1,6 @@
+importScripts('/resources/testharness.js');
+
+test(() => {
+  assert_false('fetchLater' in self);
+}, `fetchLater() is not supported in worker.`);
+done();
diff --git a/test/wpt/tests/fetch/fetch-later/headers/header-referrer-no-referrer-when-downgrade.tentative.https.html b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-no-referrer-when-downgrade.tentative.https.html
new file mode 100644
index 00000000000..38eada4513c
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-no-referrer-when-downgrade.tentative.https.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<html>
+<head>
+<title>FetchLater Referrer Header: No Referrer When Downgrade Policy</title>
+<meta name='referrer' content='no-referrer-when-downgrade'>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/fetch/fetch-later/resources/header-referrer-helper.js"></script>
+</head>
+<body>
+<script>
+
+const {
+  HTTPS_ORIGIN,
+} = get_host_info();
+
+testReferrerHeader(token(), HTTPS_ORIGIN, REFERRER_URL);
+
+</script>
+</body>
+</html>
diff --git a/test/wpt/tests/fetch/fetch-later/headers/header-referrer-no-referrer.tentative.https.html b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-no-referrer.tentative.https.html
new file mode 100644
index 00000000000..75e9ece7ba5
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-no-referrer.tentative.https.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html>
+<head>
+<title>FetchLater Referrer Header: No Referrer Policy</title>
+<meta name='referrer' content='no-referrer'>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/fetch/fetch-later/resources/header-referrer-helper.js"></script>
+</head>
+<body>
+<script>
+
+testReferrerHeader(token(), /*host=*/'', /*expectedReferer=*/"");
+
+</script>
+</body>
+</html>
diff --git a/test/wpt/tests/fetch/fetch-later/headers/header-referrer-origin-when-cross-origin.tentative.https.html b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-origin-when-cross-origin.tentative.https.html
new file mode 100644
index 00000000000..b9f14171ba3
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-origin-when-cross-origin.tentative.https.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+<head>
+<title>FetchLater Referrer Header: Origin When Cross Origin Policy</title>
+<meta name='referrer' content='origin-when-cross-origin'>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/fetch/fetch-later/resources/header-referrer-helper.js"></script>
+</head>
+<body>
+<script>
+
+const {
+  HTTPS_ORIGIN,
+  HTTPS_REMOTE_ORIGIN
+} = get_host_info();
+
+testReferrerHeader(token(), HTTPS_ORIGIN, REFERRER_URL);
+testReferrerHeader(token(), HTTPS_REMOTE_ORIGIN, REFERRER_ORIGIN);
+
+</script>
+</body>
+</html>
diff --git a/test/wpt/tests/fetch/fetch-later/headers/header-referrer-origin.tentative.https.html b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-origin.tentative.https.html
new file mode 100644
index 00000000000..ce7abf92039
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-origin.tentative.https.html
@@ -0,0 +1,23 @@
+<!doctype html>
+<html>
+<head>
+<title>FetchLater Referrer Header: Origin Policy</title>
+<meta name='referrer' content='origin'>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/fetch/fetch-later/resources/header-referrer-helper.js"></script>
+</head>
+<body>
+<script>
+
+const {
+  HTTPS_REMOTE_ORIGIN
+} = get_host_info();
+
+testReferrerHeader(token(), HTTPS_REMOTE_ORIGIN, REFERRER_ORIGIN);
+
+</script>
+</body>
+</html>
diff --git a/test/wpt/tests/fetch/fetch-later/headers/header-referrer-same-origin.tentative.https.html b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-same-origin.tentative.https.html
new file mode 100644
index 00000000000..264beddc03a
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-same-origin.tentative.https.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html>
+<head>
+<title>FetchLater Referrer Header: Same Origin Policy</title>
+<meta name='referrer' content='same-origin'>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/fetch/fetch-later/resources/header-referrer-helper.js"></script>
+</head>
+<body>
+<script>
+
+const {
+  HTTPS_REMOTE_ORIGIN
+} = get_host_info();
+
+testReferrerHeader(token(), /*host=*/'', REFERRER_URL);
+testReferrerHeader(token(), HTTPS_REMOTE_ORIGIN, /*expectedReferrer=*/'');
+
+</script>
+</body>
+</html>
diff --git a/test/wpt/tests/fetch/fetch-later/headers/header-referrer-strict-origin-when-cross-origin.tentative.https.html b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-strict-origin-when-cross-origin.tentative.https.html
new file mode 100644
index 00000000000..9133f2496fe
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-strict-origin-when-cross-origin.tentative.https.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html>
+<head>
+<title>FetchLater Referrer Header: Strict Origin Policy</title>
+<meta name='referrer' content='strict-origin'>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/fetch/fetch-later/resources/header-referrer-helper.js"></script>
+</head>
+<body>
+<script>
+
+const {
+  HTTPS_REMOTE_ORIGIN
+} = get_host_info();
+
+testReferrerHeader(token(), HTTPS_REMOTE_ORIGIN, REFERRER_ORIGIN);
+// Note: FetchLater cannot be used for non-secure URL.
+
+</script>
+</body>
+</html>
diff --git a/test/wpt/tests/fetch/fetch-later/headers/header-referrer-strict-origin.tentative.https.html b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-strict-origin.tentative.https.html
new file mode 100644
index 00000000000..943d70bbc58
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-strict-origin.tentative.https.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html>
+<head>
+<title>FetchLater Referrer Header: Strict Origin Policy</title>
+<meta name='referrer' content='strict-origin'>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/fetch/fetch-later/resources/header-referrer-helper.js"></script>
+</head>
+<body>
+<script>
+
+const {
+  HTTPS_ORIGIN
+} = get_host_info();
+
+testReferrerHeader(token(), HTTPS_ORIGIN, REFERRER_ORIGIN);
+// Note: FetchLater cannot be used for non-secure URL.
+
+</script>
+</body>
+</html>
diff --git a/test/wpt/tests/fetch/fetch-later/headers/header-referrer-unsafe-url.tentative.https.html b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-unsafe-url.tentative.https.html
new file mode 100644
index 00000000000..a602e0003a4
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/headers/header-referrer-unsafe-url.tentative.https.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html>
+<head>
+<title>FetchLater Referrer Header: Unsafe Url Policy</title>
+<meta name='referrer' content='unsafe-url'>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/fetch/fetch-later/resources/header-referrer-helper.js"></script>
+</head>
+<body>
+<script>
+
+const {
+  HTTPS_ORIGIN
+} = get_host_info();
+
+testReferrerHeader(token(), HTTPS_ORIGIN, REFERRER_URL);
+// Note: FetchLater cannot be used for non-secure URL.
+
+</script>
+</body>
+</html>
diff --git a/test/wpt/tests/fetch/fetch-later/iframe.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/iframe.tentative.https.window.js
new file mode 100644
index 00000000000..62505bc81d9
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/iframe.tentative.https.window.js
@@ -0,0 +1,65 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/utils.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+const {
+  HTTPS_ORIGIN,
+  HTTPS_NOTSAMESITE_ORIGIN,
+} = get_host_info();
+
+async function loadElement(el) {
+  const loaded = new Promise(resolve => el.onload = resolve);
+  document.body.appendChild(el);
+  await loaded;
+}
+
+// `host` may be cross-origin
+async function loadFetchLaterIframe(host, targetUrl) {
+  const url = `${host}/fetch/fetch-later/resources/fetch-later.html?url=${
+      encodeURIComponent(targetUrl)}`;
+  const iframe = document.createElement('iframe');
+  iframe.src = url;
+  await loadElement(iframe);
+  return iframe;
+}
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+
+  // Loads a blank iframe that fires a fetchLater request.
+  const iframe = document.createElement('iframe');
+  iframe.addEventListener('load', () => {
+    fetchLater(url, {activateAfter: 0});
+  });
+  await loadElement(iframe);
+
+  // The iframe should have sent the request.
+  await expectBeacon(uuid, {count: 1});
+}, 'A blank iframe can trigger fetchLater.');
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+
+  // Loads a same-origin iframe that fires a fetchLater request.
+  await loadFetchLaterIframe(HTTPS_ORIGIN, url);
+
+  // The iframe should have sent the request.
+  await expectBeacon(uuid, {count: 1});
+}, 'A same-origin iframe can trigger fetchLater.');
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+
+  // Loads a same-origin iframe that fires a fetchLater request.
+  await loadFetchLaterIframe(HTTPS_NOTSAMESITE_ORIGIN, url);
+
+  // The iframe should have sent the request.
+  await expectBeacon(uuid, {count: 1});
+}, 'A cross-origin iframe can trigger fetchLater.');
diff --git a/test/wpt/tests/fetch/fetch-later/new-window.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/new-window.tentative.https.window.js
new file mode 100644
index 00000000000..37b38d7f1dc
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/new-window.tentative.https.window.js
@@ -0,0 +1,77 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/utils.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+const {
+  HTTPS_ORIGIN,
+  HTTPS_NOTSAMESITE_ORIGIN,
+} = get_host_info();
+
+function fetchLaterPopupUrl(host, targetUrl) {
+  return `${host}/fetch/fetch-later/resources/fetch-later.html?url=${
+      encodeURIComponent(targetUrl)}`;
+}
+
+for (const target of ['', '_blank']) {
+  for (const features in ['', 'popup', 'popup,noopener']) {
+    parallelPromiseTest(
+        async t => {
+          const uuid = token();
+          const url =
+              generateSetBeaconURL(uuid, {host: HTTPS_NOTSAMESITE_ORIGIN});
+
+          // Opens a blank popup window that fires a fetchLater request.
+          const w = window.open(
+              `javascript: fetchLater("${url}", {activateAfter: 0})`, target,
+              features);
+          await new Promise(resolve => w.addEventListener('load', resolve));
+
+          // The popup should have sent the request.
+          await expectBeacon(uuid, {count: 1});
+          w.close();
+        },
+        `A blank window[target='${target}'][features='${
+            features}'] can trigger fetchLater.`);
+
+    parallelPromiseTest(
+        async t => {
+          const uuid = token();
+          const popupUrl =
+              fetchLaterPopupUrl(HTTPS_ORIGIN, generateSetBeaconURL(uuid));
+
+          // Opens a same-origin popup that fires a fetchLater request.
+          const w = window.open(popupUrl, target, features);
+          await new Promise(resolve => w.addEventListener('load', resolve));
+
+          // The popup should have sent the request.
+          await expectBeacon(uuid, {count: 1});
+          w.close();
+        },
+        `A same-origin window[target='${target}'][features='${
+            features}'] can trigger fetchLater.`);
+
+    parallelPromiseTest(
+        async t => {
+          const uuid = token();
+          const popupUrl = fetchLaterPopupUrl(
+              HTTPS_NOTSAMESITE_ORIGIN, generateSetBeaconURL(uuid));
+
+          // Opens a cross-origin popup that fires a fetchLater request.
+          const w = window.open(popupUrl, target, features);
+          // As events from cross-origin window is not accessible, waiting for
+          // its message instead.
+          await new Promise(
+              resolve => window.addEventListener('message', resolve));
+
+          // The popup should have sent the request.
+          await expectBeacon(uuid, {count: 1});
+          w.close();
+        },
+        `A cross-origin window[target='${target}'][features='${
+            features}'] can trigger fetchLater.`);
+  }
+}
diff --git a/test/wpt/tests/fetch/fetch-later/policies/csp-allowed.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/policies/csp-allowed.tentative.https.window.js
new file mode 100644
index 00000000000..5aa759c2346
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/policies/csp-allowed.tentative.https.window.js
@@ -0,0 +1,28 @@
+// META: title=FetchLater: allowed by CSP
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/utils.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+'use strict';
+
+const {
+  HTTPS_NOTSAMESITE_ORIGIN,
+} = get_host_info();
+
+// FetchLater requests allowed by Content Security Policy.
+// https://w3c.github.io/webappsec-csp/#should-block-request
+
+const meta = document.createElement('meta');
+meta.setAttribute('http-equiv', 'Content-Security-Policy');
+meta.setAttribute('content', `connect-src 'self' ${HTTPS_NOTSAMESITE_ORIGIN}`);
+document.head.appendChild(meta);
+
+promise_test(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid, {host: HTTPS_NOTSAMESITE_ORIGIN});
+  fetchLater(url, {activateAfter: 0});
+
+  await expectBeacon(uuid, {count: 1});
+  t.done();
+}, 'FetchLater allowed by CSP should succeed');
diff --git a/test/wpt/tests/fetch/fetch-later/policies/csp-blocked.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/policies/csp-blocked.tentative.https.window.js
new file mode 100644
index 00000000000..88490950d3a
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/policies/csp-blocked.tentative.https.window.js
@@ -0,0 +1,33 @@
+// META: title=FetchLater: blocked by CSP
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/utils.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+'use strict';
+
+const {
+  HTTPS_NOTSAMESITE_ORIGIN,
+} = get_host_info();
+
+// FetchLater requests blocked by Content Security Policy are rejected.
+// https://w3c.github.io/webappsec-csp/#should-block-request
+
+const meta = document.createElement('meta');
+meta.setAttribute('http-equiv', 'Content-Security-Policy');
+meta.setAttribute('content', 'connect-src \'self\'');
+document.head.appendChild(meta);
+
+promise_test(async t => {
+  const uuid = token();
+  const cspViolationUrl =
+      generateSetBeaconURL(uuid, {host: HTTPS_NOTSAMESITE_ORIGIN});
+  fetchLater(cspViolationUrl, {activateAfter: 0});
+
+  await new Promise(
+      resolve => window.addEventListener('securitypolicyviolation', e => {
+        assert_equals(e.violatedDirective, 'connect-src');
+        resolve();
+      }));
+  t.done();
+}, 'FetchLater blocked by CSP should reject');
diff --git a/test/wpt/tests/fetch/fetch-later/policies/csp-redirect-to-blocked.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/policies/csp-redirect-to-blocked.tentative.https.window.js
new file mode 100644
index 00000000000..db6b4234b97
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/policies/csp-redirect-to-blocked.tentative.https.window.js
@@ -0,0 +1,35 @@
+// META: title=FetchLater: redirect blocked by CSP
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/utils.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+// META: timeout=long
+
+'use strict';
+
+const {
+  HTTPS_NOTSAMESITE_ORIGIN,
+} = get_host_info();
+
+// FetchLater requests redirect to URL blocked by Content Security Policy.
+// https://w3c.github.io/webappsec-csp/#should-block-request
+
+const meta = document.createElement('meta');
+meta.setAttribute('http-equiv', 'Content-Security-Policy');
+meta.setAttribute('content', 'connect-src \'self\'');
+document.head.appendChild(meta);
+
+promise_test(async t => {
+  const uuid = token();
+  const cspViolationUrl =
+      generateSetBeaconURL(uuid, {host: HTTPS_NOTSAMESITE_ORIGIN});
+  const url =
+      `/common/redirect.py?location=${encodeURIComponent(cspViolationUrl)}`;
+  fetchLater(url, {activateAfter: 0});
+
+  // TODO(crbug.com/1465781): redirect csp check is handled in browser, of which
+  // result cannot be populated to renderer at this moment.
+  await expectBeacon(uuid, {count: 0});
+  t.done();
+}, 'FetchLater redirect blocked by CSP should reject');
diff --git a/test/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js
new file mode 100644
index 00000000000..4fc5979374c
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/quota.tentative.https.window.js
@@ -0,0 +1,130 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+const kQuotaPerOrigin = 64 * 1024;  // 64 kilobytes per spec.
+const {ORIGIN, HTTPS_NOTSAMESITE_ORIGIN} = get_host_info();
+
+// Runs a test case that cover a single fetchLater() call with `body` in its
+// request payload. The call is not expected to throw any errors.
+function fetchLaterPostTest(body, description) {
+  test(() => {
+    const controller = new AbortController();
+    const result = fetchLater(
+        '/fetch-later',
+        {method: 'POST', signal: controller.signal, body: body});
+    assert_false(result.activated);
+    // Release quota taken by the pending request for subsequent tests.
+    controller.abort();
+  }, description);
+}
+
+// Test small payload for each supported data types.
+for (const [dataType, skipCharset] of Object.entries(
+         BeaconDataTypeToSkipCharset)) {
+  fetchLaterPostTest(
+      makeBeaconData(generateSequentialData(0, 1024, skipCharset), dataType),
+      `A fetchLater() call accept small data in POST request of ${dataType}.`);
+}
+
+// Test various size of payloads for the same origin.
+for (const dataType in BeaconDataType) {
+  if (dataType !== BeaconDataType.FormData &&
+      dataType !== BeaconDataType.URLSearchParams) {
+    // Skips FormData & URLSearchParams, as browser adds extra bytes to them
+    // in addition to the user-provided content. It is difficult to test a
+    // request right at the quota limit.
+    fetchLaterPostTest(
+        // Generates data that is exactly 64 kilobytes.
+        makeBeaconData(generatePayload(kQuotaPerOrigin), dataType),
+        `A single fetchLater() call takes up the per-origin quota for its ` +
+            `body of ${dataType}.`);
+  }
+}
+
+// Test empty payload.
+for (const dataType in BeaconDataType) {
+  test(
+      () => {
+        assert_throws_js(
+            TypeError, () => fetchLater('/', {method: 'POST', body: ''}));
+      },
+      `A single fetchLater() call does not accept empty data in POST request ` +
+          `of ${dataType}.`);
+}
+
+// Test oversized payload.
+for (const dataType in BeaconDataType) {
+  test(
+      () => {
+        assert_throws_dom(
+            'QuotaExceededError',
+            () => fetchLater('/fetch-later', {
+              method: 'POST',
+              // Generates data that exceeds 64 kilobytes.
+              body:
+                  makeBeaconData(generatePayload(kQuotaPerOrigin + 1), dataType)
+            }));
+      },
+      `A single fetchLater() call is not allowed to exceed per-origin quota ` +
+          `for its body of ${dataType}.`);
+}
+
+// Test accumulated oversized request.
+for (const dataType in BeaconDataType) {
+  test(
+      () => {
+        const controller = new AbortController();
+        // Makes the 1st call that sends only half of allowed quota.
+        fetchLater('/fetch-later', {
+          method: 'POST',
+          signal: controller.signal,
+          body: makeBeaconData(generatePayload(kQuotaPerOrigin / 2), dataType)
+        });
+
+        // Makes the 2nd call that sends half+1 of allowed quota.
+        assert_throws_dom('QuotaExceededError', () => {
+          fetchLater('/fetch-later', {
+            method: 'POST',
+            signal: controller.signal,
+            body: makeBeaconData(
+                generatePayload(kQuotaPerOrigin / 2 + 1), dataType)
+          });
+        });
+        // Release quota taken by the pending requests for subsequent tests.
+        controller.abort();
+      },
+      `The 2nd fetchLater() call is not allowed to exceed per-origin quota ` +
+          `for its body of ${dataType}.`);
+}
+
+// Test various size of payloads across different origins.
+for (const dataType in BeaconDataType) {
+  test(
+      () => {
+        const controller = new AbortController();
+        // Makes the 1st call that sends only half of allowed quota.
+        fetchLater('/fetch-later', {
+          method: 'POST',
+          signal: controller.signal,
+          body: makeBeaconData(generatePayload(kQuotaPerOrigin / 2), dataType)
+        });
+
+        // Makes the 2nd call that sends half+1 of allowed quota, but to a
+        // different origin.
+        fetchLater(`${HTTPS_NOTSAMESITE_ORIGIN}/fetch-later`, {
+          method: 'POST',
+          signal: controller.signal,
+          body:
+              makeBeaconData(generatePayload(kQuotaPerOrigin / 2 + 1), dataType)
+        });
+        // Release quota taken by the pending requests for subsequent tests.
+        controller.abort();
+      },
+      `The 2nd fetchLater() call to another origin does not exceed per-origin` +
+          ` quota for its body of ${dataType}.`);
+}
diff --git a/test/wpt/tests/fetch/fetch-later/resources/fetch-later.html b/test/wpt/tests/fetch/fetch-later/resources/fetch-later.html
new file mode 100644
index 00000000000..b569e1a076a
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/resources/fetch-later.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<head>
+</head>
+<body>
+  <script>
+    const PARAMS = new URL(location.href).searchParams;
+    const TARGET_URL= decodeURIComponent(PARAMS.get('url')) || '';
+
+    fetchLater(TARGET_URL, {activateAfter: 0});
+    if (window.opener) {
+      window.opener.postMessage("done", "*");
+    }
+  </script>
+</body>
diff --git a/test/wpt/tests/fetch/fetch-later/resources/header-referrer-helper.js b/test/wpt/tests/fetch/fetch-later/resources/header-referrer-helper.js
new file mode 100644
index 00000000000..374097614ae
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/resources/header-referrer-helper.js
@@ -0,0 +1,39 @@
+'use strict';
+
+// https://w3c.github.io/webappsec-referrer-policy/#determine-requests-referrer
+const REFERRER_ORIGIN = self.location.origin + '/';
+const REFERRER_URL = self.location.href;
+
+function testReferrerHeader(id, host, expectedReferrer) {
+  const url = `${
+      host}/beacon/resources/inspect-header.py?header=referer&cmd=put&id=${id}`;
+
+  promise_test(t => {
+    fetchLater(url, {activateAfter: 0});
+    return pollResult(expectedReferrer, id).then(result => {
+      assert_equals(result, expectedReferrer, 'Correct referrer header result');
+    });
+  }, `Test referer header ${host}`);
+}
+
+function pollResult(expectedReferrer, id) {
+  const checkUrl =
+      `/beacon/resources/inspect-header.py?header=referer&cmd=get&id=${id}`;
+
+  return new Promise(resolve => {
+    function checkResult() {
+      fetch(checkUrl).then(response => {
+        assert_equals(
+            response.status, 200, 'Inspect header response\'s status is 200');
+        let result = response.headers.get('x-request-referer');
+
+        if (result != undefined) {
+          resolve(result);
+        } else {
+          step_timeout(checkResult.bind(this), 100);
+        }
+      });
+    }
+    checkResult();
+  });
+}
diff --git a/test/wpt/tests/fetch/fetch-later/send-on-deactivate.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/send-on-deactivate.tentative.https.window.js
new file mode 100644
index 00000000000..94877e8321a
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/send-on-deactivate.tentative.https.window.js
@@ -0,0 +1,185 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/common/get-host-info.sub.js
+// META: script=/common/utils.js
+// META: script=/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js
+// META: script=/html/browsers/browsing-the-web/back-forward-cache/resources/rc-helper.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+// NOTE: Due to the restriction of WPT runner, the following tests are all run
+// with BackgroundSync off, which is different from some browsers,
+// e.g. Chrome, default behavior, as the testing infra does not support enabling
+// it.
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  // Sets no option to test the default behavior when a document enters BFCache.
+  const helper = new RemoteContextHelper();
+  // Opens a window with noopener so that BFCache will work.
+  const rc1 = await helper.addWindow(
+      /*config=*/ null, /*options=*/ {features: 'noopener'});
+
+  // Creates a fetchLater request with default config in remote, which should
+  // only be sent on page discarded (not on entering BFCache).
+  await rc1.executeScript(url => {
+    fetchLater(url);
+    // Add a pageshow listener to stash the BFCache event.
+    window.addEventListener('pageshow', e => {
+      window.pageshowEvent = e;
+    });
+  }, [url]);
+  // Navigates away to let page enter BFCache.
+  const rc2 = await rc1.navigateToNew();
+  // Navigates back.
+  await rc2.historyBack();
+  // Verifies the page was BFCached.
+  assert_true(await rc1.executeScript(() => {
+    return window.pageshowEvent.persisted;
+  }));
+
+  // Theoretically, the request should still be pending thus 0 request received.
+  // However, 1 request is sent, as by default the WPT test runner, e.g.
+  // content_shell in Chromium, does not enable BackgroundSync permission,
+  // resulting in forcing request sending on every navigation.
+  await expectBeacon(uuid, {count: 1});
+}, `fetchLater() sends on page entering BFCache if BackgroundSync is off.`);
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  const helper = new RemoteContextHelper();
+  // Opens a window with noopener so that BFCache will work.
+  const rc1 = await helper.addWindow(
+      /*config=*/ null, /*options=*/ {features: 'noopener'});
+
+  // When the remote is put into BFCached, creates a fetchLater request w/
+  // activateAfter = 0s. It should be sent out immediately.
+  await rc1.executeScript(url => {
+    window.addEventListener('pagehide', e => {
+      if (e.persisted) {
+        fetchLater(url, {activateAfter: 0});
+      }
+    });
+    // Add a pageshow listener to stash the BFCache event.
+    window.addEventListener('pageshow', e => {
+      window.pageshowEvent = e;
+    });
+  }, [url]);
+  // Navigates away to trigger request sending.
+  const rc2 = await rc1.navigateToNew();
+  // Navigates back.
+  await rc2.historyBack();
+  // Verifies the page was BFCached.
+  assert_true(await rc1.executeScript(() => {
+    return window.pageshowEvent.persisted;
+  }));
+
+  // NOTE: In this case, it does not matter if BackgroundSync is on or off.
+  await expectBeacon(uuid, {count: 1});
+}, `Call fetchLater() when BFCached with activateAfter=0 sends immediately.`);
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  // Sets no option to test the default behavior when a document gets discarded
+  // on navigated away.
+  const helper = new RemoteContextHelper();
+  // Opens a window without BFCache.
+  const rc1 = await helper.addWindow();
+
+  // Creates a fetchLater request in remote which should only be sent on
+  // navigating away.
+  await rc1.executeScript(url => {
+    fetchLater(url);
+    // Add a pageshow listener to stash the BFCache event.
+    window.addEventListener('pageshow', e => {
+      window.pageshowEvent = e;
+    });
+  }, [url]);
+  // Navigates away to trigger request sending.
+  const rc2 = await rc1.navigateToNew();
+  // Navigates back.
+  await rc2.historyBack();
+  // Verifies the page was NOT BFCached.
+  assert_equals(undefined, await rc1.executeScript(() => {
+    return window.pageshowEvent;
+  }));
+
+  // NOTE: In this case, it does not matter if BackgroundSync is on or off.
+  await expectBeacon(uuid, {count: 1});
+}, `fetchLater() sends on navigating away a page w/o BFCache.`);
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  // Sets no option to test the default behavior when a document gets discarded
+  // on navigated away.
+  const helper = new RemoteContextHelper();
+  // Opens a window without BFCache.
+  const rc1 = await helper.addWindow();
+
+  // Creates 2 fetchLater requests in remote, and one of them is aborted
+  // immediately. The other one should only be sent right on navigating away.
+  await rc1.executeScript(url => {
+    const controller = new AbortController();
+    fetchLater(url, {signal: controller.signal});
+    fetchLater(url);
+    controller.abort();
+    // Add a pageshow listener to stash the BFCache event.
+    window.addEventListener('pageshow', e => {
+      window.pageshowEvent = e;
+    });
+  }, [url]);
+  // Navigates away to trigger request sending.
+  const rc2 = await rc1.navigateToNew();
+  // Navigates back.
+  await rc2.historyBack();
+  // Verifies the page was NOT BFCached.
+  assert_equals(undefined, await rc1.executeScript(() => {
+    return window.pageshowEvent;
+  }));
+
+  // NOTE: In this case, it does not matter if BackgroundSync is on or off.
+  await expectBeacon(uuid, {count: 1});
+}, `fetchLater() does not send aborted request on navigating away a page w/o BFCache.`);
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  const options = {activateAfter: 60000};
+  const helper = new RemoteContextHelper();
+  // Opens a window with noopener so that BFCache will work.
+  const rc1 = await helper.addWindow(
+      /*config=*/ null, /*options=*/ {features: 'noopener'});
+
+  // Creates a fetchLater request in remote which should only be sent on
+  // navigating away.
+  await rc1.executeScript((url) => {
+    // Sets activateAfter = 1m to indicate the request should NOT be sent out
+    // immediately.
+    fetchLater(url, {activateAfter: 60000});
+    // Adds a pageshow listener to stash the BFCache event.
+    window.addEventListener('pageshow', e => {
+      window.pageshowEvent = e;
+    });
+  }, [url]);
+  // Navigates away to trigger request sending.
+  const rc2 = await rc1.navigateToNew();
+  // Navigates back.
+  await rc2.historyBack();
+  // Verifies the page was BFCached.
+  assert_true(await rc1.executeScript(() => {
+    return window.pageshowEvent.persisted;
+  }));
+
+  // Theoretically, the request should still be pending thus 0 request received.
+  // However, 1 request is sent, as by default the WPT test runner, e.g.
+  // content_shell in Chromium, does not enable BackgroundSync permission,
+  // resulting in forcing request sending on every navigation, even if page is
+  // put into BFCache.
+  await expectBeacon(uuid, {count: 1});
+}, `fetchLater() with activateAfter=1m sends on page entering BFCache if BackgroundSync is off.`);
diff --git a/test/wpt/tests/fetch/fetch-later/send-on-discard/not-send-after-abort.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/send-on-discard/not-send-after-abort.tentative.https.window.js
new file mode 100644
index 00000000000..c49e0bde87b
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/send-on-discard/not-send-after-abort.tentative.https.window.js
@@ -0,0 +1,25 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/utils.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+
+'use strict';
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+
+  // Loads an iframe that creates 2 fetchLater requests. One of them is aborted.
+  const iframe = await loadScriptAsIframe(`
+    const url = '${url}';
+    const controller = new AbortController();
+    fetchLater(url, {signal: controller.signal});
+    fetchLater(url, {method: 'POST'});
+    controller.abort();
+  `);
+  // Delete the iframe to trigger deferred request sending.
+  document.body.removeChild(iframe);
+
+  // The iframe should not send the aborted request.
+  await expectBeacon(uuid, {count: 1});
+}, 'A discarded document does not send an already aborted fetchLater request.');
diff --git a/test/wpt/tests/fetch/fetch-later/send-on-discard/send-multiple-with-activate-after.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/send-on-discard/send-multiple-with-activate-after.tentative.https.window.js
new file mode 100644
index 00000000000..03078b2b516
--- /dev/null
+++ b/test/wpt/tests/fetch/fetch-later/send-on-discard/send-multiple-with-activate-after.tentative.https.window.js
@@ -0,0 +1,32 @@
+// META: script=/resources/testharness.js
+// META: script=/resources/testharnessreport.js
+// META: script=/common/utils.js
+// META: script=/pending-beacon/resources/pending_beacon-helper.js
+// META: timeout=long
+
+'use strict';
+
+parallelPromiseTest(async t => {
+  const uuid = token();
+  const url = generateSetBeaconURL(uuid);
+  const numPerMethod = 20;
+  const total = numPerMethod * 2;
+
+  // Loads an iframe that creates `numPerMethod` GET & POST fetchLater requests.
+  const iframe = await loadScriptAsIframe(`
+    const url = '${url}';
+    for (let i = 0; i < ${numPerMethod}; i++) {
+      // Changing the URL of each request to avoid HTTP Cache issue.
+      // See crbug.com/1498203#c17.
+      fetchLater(url + "&method=GET&i=" + i,
+        {method: 'GET', activateAfter: 10000});   // 10s
+      fetchLater(url + "&method=POST&i=" + i,
+        {method: 'POST', activateAfter: 8000});  // 8s
+    }
+  `);
+  // Delete the iframe to trigger deferred request sending.
+  document.body.removeChild(iframe);
+
+  // The iframe should have sent all requests.
+  await expectBeacon(uuid, {count: total});
+}, 'A discarded document sends all its fetchLater requests, no matter how much their activateAfter timeout remain.');
diff --git a/test/wpt/tests/fetch/fetch-later/sendondiscard.tentative.https.window.js b/test/wpt/tests/fetch/fetch-later/send-on-discard/send-multiple.tentative.https.window.js
similarity index 69%
rename from test/wpt/tests/fetch/fetch-later/sendondiscard.tentative.https.window.js
rename to test/wpt/tests/fetch/fetch-later/send-on-discard/send-multiple.tentative.https.window.js
index 0613d18dffb..25ce98d446e 100644
--- a/test/wpt/tests/fetch/fetch-later/sendondiscard.tentative.https.window.js
+++ b/test/wpt/tests/fetch/fetch-later/send-on-discard/send-multiple.tentative.https.window.js
@@ -2,6 +2,7 @@
 // META: script=/resources/testharnessreport.js
 // META: script=/common/utils.js
 // META: script=/pending-beacon/resources/pending_beacon-helper.js
+// META: timeout=long
 
 'use strict';
 
@@ -13,16 +14,17 @@ parallelPromiseTest(async t => {
 
   // Loads an iframe that creates `numPerMethod` GET & POST fetchLater requests.
   const iframe = await loadScriptAsIframe(`
-    const url = "${url}";
+    const url = '${url}';
     for (let i = 0; i < ${numPerMethod}; i++) {
-      let get = fetchLater(url);
-      let post = fetchLater(url, {method: 'POST'});
+      // Changing the URL of each request to avoid HTTP Cache issue.
+      // See crbug.com/1498203#c17.
+      fetchLater(url + "&method=GET&i=" + i);
+      fetchLater(url + "&method=POST&i=" + i, {method: 'POST'});
     }
   `);
-
   // Delete the iframe to trigger deferred request sending.
   document.body.removeChild(iframe);
 
   // The iframe should have sent all requests.
   await expectBeacon(uuid, {count: total});
-}, 'A discarded document sends all its fetchLater requests with default config.');
+}, 'A discarded document sends all its fetchLater requests.');
diff --git a/test/wpt/tests/fetch/metadata/portal.https.sub.html b/test/wpt/tests/fetch/metadata/portal.https.sub.html
deleted file mode 100644
index 55b555a1b8e..00000000000
--- a/test/wpt/tests/fetch/metadata/portal.https.sub.html
+++ /dev/null
@@ -1,50 +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>
-<script src=/portals/resources/stash-utils.sub.js></script>
-<body>
-<script>
-  const USER = true;
-  const FORCED = false;
-
-  function create_test(host, expectations) {
-    async_test(t => {
-      assert_implements("HTMLPortalElement" in window, "Portals are not supported.");
-
-      let p = document.createElement('portal');
-      const key = token();
-      StashUtils.takeValue(key).then(t.step_func_done(value => {
-        assert_header_equals(value, expectations, `{{host}} -> ${host} portal`);
-      }));
-
-      let url = `https://${host}/fetch/metadata/resources/post-to-owner.py?key=${key}`;
-      p.src = url;
-      document.body.appendChild(p);
-    }, `{{host}} -> ${host} portal`);
-  }
-
-  create_test("{{host}}:{{ports[https][0]}}", {
-    "site": "same-origin",
-    "user": "",
-    "mode": "navigate",
-    "dest": "iframe"
-  });
-
-  create_test("{{hosts[][www]}}:{{ports[https][0]}}", {
-    "site": "same-site",
-    "user": "",
-    "mode": "navigate",
-    "dest": "iframe"
-  });
-
-  create_test("{{hosts[alt][www]}}:{{ports[https][0]}}", {
-    "site": "cross-site",
-    "user": "",
-    "mode": "navigate",
-    "dest": "iframe"
-  });
-</script>
diff --git a/test/wpt/tests/fetch/orb/resources/utils.js b/test/wpt/tests/fetch/orb/resources/utils.js
index 94a2177f079..45fbc4cb38e 100644
--- a/test/wpt/tests/fetch/orb/resources/utils.js
+++ b/test/wpt/tests/fetch/orb/resources/utils.js
@@ -10,9 +10,92 @@ function contentTypeOptions(type) {
   return header("X-Content-Type-Options", type);
 }
 
-function fetchORB(file, options, ...pipe) {
-  return fetch(`${file}${pipe.length ? `?pipe=${pipe.join("|")}` : ""}`, {
-    ...(options || {}),
+function testFetchNoCors(_t, path, { headers }) {
+  return fetch(path, {
+    ...(headers ? { headers } : {}),
     mode: "no-cors",
   });
 }
+
+function testElementInitiator(t, path, name) {
+  let element = document.createElement(name);
+  element.src = path;
+  t.add_cleanup(() => element.remove());
+  return new Promise((resolve, reject) => {
+    element.onerror = e => reject(new TypeError());
+    element.onload = resolve;
+
+    document.body.appendChild(element);
+  });
+}
+
+function testImageInitiator(t, path) {
+  return testElementInitiator(t, path, "img");
+}
+
+function testAudioInitiator(t, path) {
+  return testElementInitiator(t, path, "audio");
+}
+
+function testVideoInitiator(t, path) {
+  return testElementInitiator(t, path, "video");
+}
+
+function testScriptInitiator(t, path) {
+  return testElementInitiator(t, path, "script");
+}
+
+function runTest(t, test, file, options, ...pipe) {
+  const path = `${file}${pipe.length ? `?pipe=${pipe.join("|")}` : ""}`;
+  return test(t, path, options)
+}
+
+function testRunAll(file, testCallback, adapter, options) {
+  let testcase = function (test, message, skip) {
+    return {test, message, skip};
+  };
+
+  const name = "...";
+  [ testcase(testFetchNoCors, `fetch(${name}, {mode: "no-cors"})`, false || options.skip.includes("fetch")),
+    testcase(testImageInitiator, `<img src=${name}>`,  options.onlyFetch || options.skip.includes("image")),
+    testcase(testAudioInitiator, `<audio src=${name}>`, options.onlyFetch || options.skip.includes("audio")),
+    testcase(testVideoInitiator, `<video src=${name}>`, options.onlyFetch || options.skip.includes("video")),
+    testcase(testScriptInitiator, `<script src=${name}>`, options.onlyFetch || options.skip.includes("script")),
+  ].filter(({skip}) => !skip)
+  .forEach(({test, message}) => {
+    testCallback((t, ...args) => adapter(t, runTest(t, test, file, options, ...args), message), header => `${header}: ${message}`);
+  });
+}
+
+function expected_block(file, testCallback, options = {}) {
+  let defaultOptions = {
+    onlyFetch: !self.GLOBAL.isWindow(),
+    skip: []
+  };
+  testRunAll(file, testCallback, (t, promise, message) => promise_rejects_js(t, TypeError, promise, message), { ...defaultOptions, ...options });
+}
+
+function expected_allow(file, testCallback, options = {}) {
+  let defaultOptions = {
+    onlyFetch: !self.GLOBAL.isWindow(),
+    skip: [],
+    headers: null
+  };
+  testRunAll(file, testCallback, (_t, promise, _message) => promise, { ...defaultOptions, ...options });
+}
+
+function expected_allow_fetch(file, testCallback, options = {}) {
+  let defaultOptions = {
+    skip: [],
+    headers: null,
+  };
+  testRunAll(file, testCallback, (_t, promise, _message) => promise, { ...defaultOptions, ...options, onlyFetch: true });
+}
+
+function expected_block_fetch(file, testCallback, options = {}) {
+  let defaultOptions = {
+    skip: [],
+    headers: null,
+  };
+  testRunAll(file, testCallback, (t, promise, message) => promise_rejects_js(t, TypeError, promise, message), { ...defaultOptions, ...options, onlyFetch: true });
+}
diff --git a/test/wpt/tests/fetch/orb/tentative/content-range.sub.any.js b/test/wpt/tests/fetch/orb/tentative/content-range.sub.any.js
index ee97521a55c..c965aea4f8d 100644
--- a/test/wpt/tests/fetch/orb/tentative/content-range.sub.any.js
+++ b/test/wpt/tests/fetch/orb/tentative/content-range.sub.any.js
@@ -3,29 +3,18 @@
 const url =
   "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/orb/resources/image.png";
 
-promise_test(async () => {
-  let headers = new Headers([["Range", "bytes=0-99"]]);
-  await fetchORB(
-    url,
-    { headers },
-    header("Content-Range", "bytes 0-99/1010"),
-    "slice(null,100)",
-    "status(206)"
-  );
-}, "ORB shouldn't block opaque range of image/png starting at zero");
+expected_allow_fetch(
+  url,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, header("Content-Range", "bytes 0-99/1010"), "slice(null,100)", "status(206)"),
+      message("ORB shouldn't block opaque range of image/png starting at zero")),
+  { headers: new Headers([["Range", "bytes=0-99"]]) });
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        url,
-        { headers: new Headers([["Range", "bytes 10-99"]]) },
-        header("Content-Range", "bytes 10-99/1010"),
-        "slice(10,100)",
-        "status(206)"
-      )
-    ),
-  "ORB should block opaque range of image/png not starting at zero, that isn't subsequent"
-);
+expected_block_fetch(
+  url,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, header("Content-Range", "bytes 10-99/1010"), "slice(10,100)", "status(206)"),
+      message("ORB should block opaque range of image/png not starting at zero, that isn't subsequent")),
+  { headers: new Headers([["Range", "bytes 10-99"]]) });
diff --git a/test/wpt/tests/fetch/orb/tentative/known-mime-type.sub.any.js b/test/wpt/tests/fetch/orb/tentative/known-mime-type.sub.any.js
index b0521e8b363..cc6d208fd3f 100644
--- a/test/wpt/tests/fetch/orb/tentative/known-mime-type.sub.any.js
+++ b/test/wpt/tests/fetch/orb/tentative/known-mime-type.sub.any.js
@@ -2,85 +2,98 @@
 
 const path = "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/orb/resources";
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(`${path}/font.ttf`, null, contentType("font/ttf"))
-    ),
-  "ORB should block opaque font/ttf"
-);
+expected_block(
+  `${path}/font.ttf`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("font/ttf")),
+      message("ORB should block opaque font/ttf")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(`${path}/text.txt`, null, contentType("text/plain"))
-    ),
-  "ORB should block opaque text/plain"
-);
+expected_block(
+  `${path}/text.txt`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("text/plain")),
+      message("ORB should block opaque text/plain")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(`${path}/data.json`, null, contentType("application/json"))
-    ),
-  "ORB should block opaque application/json (non-empty)"
-);
+expected_block(
+  `${path}/data.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB should block opaque application/json (non-empty)")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(`${path}/empty.json`, null, contentType("application/json"))
-    ),
-  "ORB should block opaque application/json (empty)"
-);
+expected_block(
+  `${path}/empty.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB should block opaque application/json (empty)")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(`${path}/data_non_ascii.json`, null, contentType("application/json"))
-    ),
-  "ORB should block opaque application/json which contains non ascii characters"
-);
+expected_block(
+  `${path}/data_non_ascii.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB should block opaque application/json which contains non ascii characters")));
 
-promise_test(async () => {
-  fetchORB(`${path}/image.png`, null, contentType("image/png"));
-}, "ORB shouldn't block opaque image/png");
+expected_allow(
+  `${path}/image.png`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("image/png")),
+      message("ORB shouldn't block opaque image/png")),
+  { skip: ["audio", "video", "script"] });
 
-promise_test(async () => {
-  await fetchORB(`${path}/script.js`, null, contentType("text/javascript"));
-}, "ORB shouldn't block opaque text/javascript");
+expected_allow(
+  `${path}/script.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("text/javascript")),
+      message("ORB shouldn't block opaque text/javascript")),
+  { skip: ["image", "audio", "video"] });
 
 // Test javascript validation can correctly decode the content with BOM.
-promise_test(async () => {
-  await fetchORB(`${path}/script-utf16-bom.js`, null, contentType("application/json"));
-}, "ORB shouldn't block opaque text/javascript (utf16 encoded with BOM)");
+expected_allow(
+  `${path}/script-utf16-bom.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB shouldn't block opaque text/javascript (utf16 encoded with BOM)")),
+  { skip: ["image", "audio", "video"] });
 
 // Test javascript validation can correctly decode the content with the http charset hint.
-promise_test(async () => {
-  await fetchORB(`${path}/script-utf16-without-bom.js`, null, contentType("application/json; charset=utf-16"));
-}, "ORB shouldn't block opaque text/javascript (utf16 encoded without BOM but charset is provided in content-type)");
+expected_allow(
+  `${path}/script-utf16-without-bom.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json; charset=utf-16")),
+      message("ORB shouldn't block opaque text/javascript (utf16 encoded without BOM but charset is provided in content-type)")),
+  { skip: ["image", "audio", "video"] });
 
 // Test javascript validation can correctly decode the content for iso-8559-1 (fallback decoder in Firefox).
-promise_test(async () => {
-  await fetchORB(`${path}/script-iso-8559-1.js`, null, contentType("application/json"));
-}, "ORB shouldn't block opaque text/javascript (iso-8559-1 encoded)");
+expected_allow(
+  `${path}/script-iso-8559-1.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB shouldn't block opaque text/javascript (iso-8559-1 encoded)")),
+  { skip: ["image", "audio", "video"] });
 
 // Test javascript validation can correctly parse asm.js.
-promise_test(async () => {
-  await fetchORB(`${path}/script-asm-js-valid.js`, null, contentType("application/json"));
-}, "ORB shouldn't block text/javascript with valid asm.js");
+expected_allow(
+  `${path}/script-asm-js-valid.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB shouldn't block text/javascript with valid asm.js")),
+  { skip: ["image", "audio", "video"] });
 
 // Test javascript validation can correctly parse invalid asm.js with valid JS syntax.
-promise_test(async () => {
-  await fetchORB(`${path}/script-asm-js-invalid.js`, null, contentType("application/json"));
-}, "ORB shouldn't block text/javascript with invalid asm.js");
+expected_allow(
+  `${path}/script-asm-js-invalid.js`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json")),
+      message("ORB shouldn't block text/javascript with invalid asm.js")),
+  { skip: ["image", "audio", "video"] });
diff --git a/test/wpt/tests/fetch/orb/tentative/nosniff.sub.any.js b/test/wpt/tests/fetch/orb/tentative/nosniff.sub.any.js
index 3df9d22e0b7..d1e01fd87b5 100644
--- a/test/wpt/tests/fetch/orb/tentative/nosniff.sub.any.js
+++ b/test/wpt/tests/fetch/orb/tentative/nosniff.sub.any.js
@@ -2,58 +2,31 @@
 
 const path = "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/orb/resources";
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        `${path}/text.txt`,
-        null,
-        contentType("text/plain"),
-        contentTypeOptions("nosniff")
-      )
-    ),
-  "ORB should block opaque text/plain with nosniff"
-);
+expected_block(
+  `${path}/text.txt`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("text/plain"), contentTypeOptions("nosniff")),
+      message("ORB should block opaque text/plain with nosniff")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        `${path}/data.json`,
-        null,
-        contentType("application/json"),
-        contentTypeOptions("nosniff")
-      )
-    ),
-  "ORB should block opaque-response-blocklisted MIME type with nosniff"
-);
+expected_block(
+  `${path}/data.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json"), contentTypeOptions("nosniff")),
+      message("ORB should block opaque-response-blocklisted MIME type with nosniff")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        `${path}/data.json`,
-        null,
-        contentType(""),
-        contentTypeOptions("nosniff")
-      )
-    ),
-  "ORB should block opaque response with empty Content-Type and nosniff"
-);
+expected_block(
+  `${path}/data.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentTypeOptions("nosniff")),
+      message("ORB should block opaque response with empty Content-Type and nosniff")));
 
-promise_test(
-  () =>
-    fetchORB(
-      `${path}/image.png`,
-      null,
-      contentType(""),
-      contentTypeOptions("nosniff")
-    ),
-  "ORB shouldn't block opaque image with empty Content-Type and nosniff"
-);
+expected_allow(
+  `${path}/image.png`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType(""), contentType("text/javascript")),
+      message("ORB shouldn't block opaque image with empty Content-Type and nosniff")),
+  { skip: ["audio", "video", "script"] });
diff --git a/test/wpt/tests/fetch/orb/tentative/status.sub.any.js b/test/wpt/tests/fetch/orb/tentative/status.sub.any.js
index b94d8b7f635..e281ca6f533 100644
--- a/test/wpt/tests/fetch/orb/tentative/status.sub.any.js
+++ b/test/wpt/tests/fetch/orb/tentative/status.sub.any.js
@@ -2,32 +2,15 @@
 
 const path = "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/orb/resources";
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        `${path}/data.json`,
-        null,
-        contentType("application/json"),
-        "status(206)"
-      )
-    ),
-  "ORB should block opaque-response-blocklisted MIME type with status 206"
-);
+expected_block(
+  `${path}/data.json`,
+  (orb_test, message) => promise_test(
+    t => orb_test(t, contentType("application/json"), "status(206)"),
+    message("ORB should block opaque-response-blocklisted MIME type with status 206")));
 
-promise_test(
-  t =>
-    promise_rejects_js(
-      t,
-      TypeError,
-      fetchORB(
-        `${path}/data.json`,
-        null,
-        contentType("application/json"),
-        "status(302)"
-      )
-    ),
-  "ORB should block opaque response with non-ok status"
-);
+expected_block(
+  `${path}/data.json`,
+  (orb_test, message) =>
+    promise_test(
+      t => orb_test(t, contentType("application/json"), "status(302)"),
+      message("ORB should block opaque response with non-ok status")));
diff --git a/test/wpt/tests/fetch/orb/tentative/unknown-mime-type.sub.any.js b/test/wpt/tests/fetch/orb/tentative/unknown-mime-type.sub.any.js
index f72ff928adb..268ebb0258d 100644
--- a/test/wpt/tests/fetch/orb/tentative/unknown-mime-type.sub.any.js
+++ b/test/wpt/tests/fetch/orb/tentative/unknown-mime-type.sub.any.js
@@ -2,27 +2,39 @@
 
 const path = "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/orb/resources";
 
-promise_test(
-  () => fetchORB(`${path}/font.ttf`, null, contentType("")),
-  "ORB shouldn't block opaque failed missing MIME type (font/ttf)"
-);
+expected_allow_fetch(
+  `${path}/font.ttf`,
+  (promise, message) =>
+    promise_test(
+      t => promise(t, contentType("")),
+      message("ORB shouldn't block opaque failed missing MIME type (font/ttf)")));
 
-promise_test(
-  () => fetchORB(`${path}/text.txt`, null, contentType("")),
-  "ORB shouldn't block opaque failed missing MIME type (text/plain)"
-);
+expected_allow_fetch(
+  `${path}/text.ttf`,
+  (promise, message) =>
+    promise_test(
+      t => promise(t, contentType("")),
+      message("ORB shouldn't block opaque failed missing MIME type (text/plain)")));
 
-promise_test(
-  t => fetchORB(`${path}/data.json`, null, contentType("")),
-  "ORB shouldn't block opaque failed missing MIME type (application/json)"
-);
+expected_allow_fetch(
+  `${path}/data.json`,
+  (promise, message) =>
+    promise_test(
+      t => promise(t, contentType("")),
+      message("ORB shouldn't block opaque failed missing MIME type (application/json)")));
 
-promise_test(
-  () => fetchORB(`${path}/image.png`, null, contentType("")),
-  "ORB shouldn't block opaque failed missing MIME type (image/png)"
-);
+expected_allow(
+  `${path}/image.png`,
+  (promise, message) =>
+    promise_test(
+      t => promise(t, contentType("")),
+      message("ORB shouldn't block opaque failed missing MIME type (image/png)")),
+  { skip: ["audio", "video", "script"] });
 
-promise_test(
-  () => fetchORB(`${path}/script.js`, null, contentType("")),
-  "ORB shouldn't block opaque failed missing MIME type (text/javascript)"
-);
+expected_allow(
+  `${path}/script.js`,
+  (promise, message) =>
+    promise_test(
+      t => promise(t, contentType("")),
+      message("ORB shouldn't block opaque failed missing MIME type (text/javascript)")),
+      { skip: ["image", "audio", "video"] });
diff --git a/test/wpt/tests/fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.js b/test/wpt/tests/fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.js
index 21233f61ea6..33e94d57f1a 100644
--- a/test/wpt/tests/fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.js
+++ b/test/wpt/tests/fetch/private-network-access/fenced-frame-no-preflight-required.tentative.https.window.js
@@ -17,7 +17,7 @@ setup(() => {
 //
 // All fetches unaffected by Private Network Access.
 
-promise_test_parallel(
+promise_test(
     t => fencedFrameTest(t, {
       source: {server: Server.HTTPS_LOCAL},
       target: {server: Server.HTTPS_LOCAL},
@@ -25,7 +25,7 @@ promise_test_parallel(
     }),
     'local to local: no preflight required.');
 
-promise_test_parallel(
+promise_test(
     t => fencedFrameTest(t, {
       source: {server: Server.HTTPS_LOCAL},
       target: {server: Server.HTTPS_PRIVATE},
@@ -33,7 +33,7 @@ promise_test_parallel(
     }),
     'local to private: no preflight required.');
 
-promise_test_parallel(
+promise_test(
     t => fencedFrameTest(t, {
       source: {server: Server.HTTPS_LOCAL},
       target: {server: Server.HTTPS_PUBLIC},
@@ -41,7 +41,7 @@ promise_test_parallel(
     }),
     'local to public: no preflight required.');
 
-promise_test_parallel(
+promise_test(
     t => fencedFrameTest(t, {
       source: {server: Server.HTTPS_PRIVATE},
       target: {server: Server.HTTPS_PRIVATE},
@@ -49,7 +49,7 @@ promise_test_parallel(
     }),
     'private to private: no preflight required.');
 
-promise_test_parallel(
+promise_test(
     t => fencedFrameTest(t, {
       source: {server: Server.HTTPS_PRIVATE},
       target: {server: Server.HTTPS_PUBLIC},
@@ -57,7 +57,7 @@ promise_test_parallel(
     }),
     'private to public: no preflight required.');
 
-promise_test_parallel(
+promise_test(
     t => fencedFrameTest(t, {
       source: {server: Server.HTTPS_PUBLIC},
       target: {server: Server.HTTPS_PUBLIC},
@@ -65,7 +65,7 @@ promise_test_parallel(
     }),
     'public to public: no preflight required.');
 
-promise_test_parallel(
+promise_test(
     t => fencedFrameTest(t, {
       source: {
         server: Server.HTTPS_LOCAL,
@@ -76,7 +76,7 @@ promise_test_parallel(
     }),
     'treat-as-public-address to public: no preflight required.');
 
-promise_test_parallel(
+promise_test(
     t => fencedFrameTest(t, {
       source: {
         server: Server.HTTPS_LOCAL,
diff --git a/test/wpt/tests/fetch/private-network-access/iframe.tentative.https.window.js b/test/wpt/tests/fetch/private-network-access/iframe.tentative.https.window.js
index 0c12970557d..1e00c0af41a 100644
--- a/test/wpt/tests/fetch/private-network-access/iframe.tentative.https.window.js
+++ b/test/wpt/tests/fetch/private-network-access/iframe.tentative.https.window.js
@@ -11,8 +11,9 @@
 //
 // Spec: https://wicg.github.io/private-network-access/#integration-fetch
 //
-// These tests verify that contexts can navigate iframes to less-public address
-// spaces iff the target server responds affirmatively to preflight requests.
+// These tests verify that secure contexts can navigate iframes to less-public
+// address spaces iff the target server responds affirmatively to preflight
+// requests.
 //
 // This file covers only those tests that must execute in a secure context.
 // Other tests are defined in: iframe.tentative.window.js
@@ -100,7 +101,7 @@ function makePreflightTests({
     source,
     target: {
       server: targetServer,
-      behavior: { preflight: PreflightBehavior.success(token()) },
+      behavior: { preflight: PreflightBehavior.navigation(token()) },
     },
     expected: FrameTestResult.SUCCESS,
   }), prefix + "success.");
@@ -242,7 +243,7 @@ subsetTestByKey('grandparent', iframeGrandparentTest, {
   grandparentServer: Server.HTTPS_PUBLIC,
   child: {
     server: Server.HTTPS_LOCAL,
-    behavior: { preflight: PreflightBehavior.success(token()) },
+    behavior: { preflight: PreflightBehavior.navigation(token()) },
   },
   grandchild: {
     server: Server.HTTPS_LOCAL,
@@ -256,11 +257,11 @@ subsetTestByKey('grandparent', iframeGrandparentTest, {
   grandparentServer: Server.HTTPS_PUBLIC,
   child: {
     server: Server.HTTPS_LOCAL,
-    behavior: { preflight: PreflightBehavior.success(token()) },
+    behavior: { preflight: PreflightBehavior.navigation(token()) },
   },
   grandchild: {
     server: Server.HTTPS_LOCAL,
-    behavior: { preflight: PreflightBehavior.success(token()) },
+    behavior: { preflight: PreflightBehavior.navigation(token()) },
   },
   expected: FrameTestResult.SUCCESS,
 });
diff --git a/test/wpt/tests/fetch/private-network-access/iframe.tentative.window.js b/test/wpt/tests/fetch/private-network-access/iframe.tentative.window.js
index c0770df8385..441e0884d27 100644
--- a/test/wpt/tests/fetch/private-network-access/iframe.tentative.window.js
+++ b/test/wpt/tests/fetch/private-network-access/iframe.tentative.window.js
@@ -8,7 +8,7 @@
 // less-public address spaces, and can navigate them otherwise.
 //
 // This file covers only those tests that must execute in a non secure context.
-// Other tests are defined in: iframe.https.window.js
+// Other tests are defined in: iframe.tentative.https.window.js
 
 setup(() => {
   // Making sure we are in a non secure context, as expected.
diff --git a/test/wpt/tests/fetch/private-network-access/resources/fenced-frame-local-network-access-target.https.html b/test/wpt/tests/fetch/private-network-access/resources/fenced-frame-private-network-access-target.https.html
similarity index 100%
rename from test/wpt/tests/fetch/private-network-access/resources/fenced-frame-local-network-access-target.https.html
rename to test/wpt/tests/fetch/private-network-access/resources/fenced-frame-private-network-access-target.https.html
diff --git a/test/wpt/tests/fetch/private-network-access/resources/fenced-frame-local-network-access.https.html b/test/wpt/tests/fetch/private-network-access/resources/fenced-frame-private-network-access.https.html
similarity index 100%
rename from test/wpt/tests/fetch/private-network-access/resources/fenced-frame-local-network-access.https.html
rename to test/wpt/tests/fetch/private-network-access/resources/fenced-frame-private-network-access.https.html
diff --git a/test/wpt/tests/fetch/private-network-access/resources/fenced-frame-local-network-access.https.html.headers b/test/wpt/tests/fetch/private-network-access/resources/fenced-frame-private-network-access.https.html.headers
similarity index 100%
rename from test/wpt/tests/fetch/private-network-access/resources/fenced-frame-local-network-access.https.html.headers
rename to test/wpt/tests/fetch/private-network-access/resources/fenced-frame-private-network-access.https.html.headers
diff --git a/test/wpt/tests/fetch/private-network-access/resources/opener.html b/test/wpt/tests/fetch/private-network-access/resources/opener.html
new file mode 100644
index 00000000000..40e3b60bb52
--- /dev/null
+++ b/test/wpt/tests/fetch/private-network-access/resources/opener.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Opener</title>
+<body></body>
+<script>
+  window.onmessage = (event) => {
+    const { url } = event.data;
+    const popup = window.open(url);
+    parent.postMessage(popup ? "success" : "failure", "*");
+  };
+</script>
diff --git a/test/wpt/tests/fetch/private-network-access/resources/preflight.py b/test/wpt/tests/fetch/private-network-access/resources/preflight.py
index be3abdbb2a1..255bd56a33e 100644
--- a/test/wpt/tests/fetch/private-network-access/resources/preflight.py
+++ b/test/wpt/tests/fetch/private-network-access/resources/preflight.py
@@ -62,7 +62,7 @@
 _ACAPN = ("Access-Control-Allow-Private-Network", "true")
 _ACAH = ("Access-Control-Allow-Headers", "Service-Worker")
 
-def _get_response_headers(method, mode):
+def _get_response_headers(method, mode, origin):
   acam = ("Access-Control-Allow-Methods", method)
 
   if mode == b"cors":
@@ -74,6 +74,15 @@ def _get_response_headers(method, mode):
   if mode == b"cors+pna+sw":
     return [acam, _ACAO, _ACAPN, _ACAH]
 
+  if mode == b"navigation":
+    return [
+        acam,
+        ("Access-Control-Allow-Origin", origin),
+        _ACAPN,
+        ("Access-Control-Allow-Credentials", "true"),
+        ("Access-Control-Allow-Headers", "Upgrade-Insecure-Requests")
+    ]
+
   return []
 
 def _get_expect_single_preflight(request):
@@ -115,7 +124,8 @@ def _handle_preflight_request(request, response):
 
   method = request.headers.get("Access-Control-Request-Method")
   mode = request.GET.get(b"preflight-headers")
-  headers = _get_response_headers(method, mode)
+  origin = request.headers.get("Origin")
+  headers = _get_response_headers(method, mode, origin)
 
   return (headers, "preflight")
 
@@ -147,7 +157,8 @@ def _handle_final_request(request, response):
       request.server.stash.put(uuid, "final")
 
     mode = request.GET.get(b"final-headers")
-    headers = _get_response_headers(request.method, mode)
+    origin = request.headers.get("Origin")
+    headers = _get_response_headers(request.method, mode, origin)
 
   redirect = request.GET.get(b"redirect")
   if redirect is not None:
diff --git a/test/wpt/tests/fetch/private-network-access/resources/support.sub.js b/test/wpt/tests/fetch/private-network-access/resources/support.sub.js
index 27d733d8b7f..c3bdb8139ba 100644
--- a/test/wpt/tests/fetch/private-network-access/resources/support.sub.js
+++ b/test/wpt/tests/fetch/private-network-access/resources/support.sub.js
@@ -269,6 +269,13 @@ const PreflightBehavior = {
     "preflight-headers": "cors+pna",
     "expect-single-preflight": true,
   }),
+
+  // The preflight response should succeed and allow origins and headers for
+  // navigations.
+  navigation: (uuid) => ({
+    "preflight-uuid": uuid,
+    "preflight-headers": "navigation",
+  }),
 };
 
 // Methods generate behavior specifications for how `resources/preflight.py`
@@ -456,25 +463,45 @@ async function iframeTest(t, { source, target, expected }) {
   const result = await Promise.race([
       messagePromise.then((data) => data.message),
       new Promise((resolve) => {
-        t.step_timeout(() => resolve("timeout"), 500 /* ms */);
+        t.step_timeout(() => resolve("timeout"), 2000 /* ms */);
       }),
   ]);
 
   assert_equals(result, expected);
 }
 
+const WindowOpenTestResult = {
+  SUCCESS: "success",
+  FAILURE: "failure",
+};
+
+async function windowOpenTest(t, { source, target, expected }) {
+  const targetUrl = preflightUrl(target);
+
+  const sourceUrl =
+      resolveUrl("resources/opener.html", sourceResolveOptions(source));
+  sourceUrl.searchParams.set("url", targetUrl);
+
+  const iframe = await appendIframe(t, document, sourceUrl);
+  const reply = futureMessage({ source: iframe.contentWindow });
+
+  iframe.contentWindow.postMessage({ url: targetUrl.href }, "*");
+
+  assert_equals(await reply, expected);
+}
+
 // Similar to `iframeTest`, but replaced iframes with fenced frames.
 async function fencedFrameTest(t, { source, target, expected }) {
   // Allows running tests in parallel.
   const target_url = preflightUrl(target);
-  target_url.searchParams.set("file", "fenced-frame-local-network-access-target.https.html");
+  target_url.searchParams.set("file", "fenced-frame-private-network-access-target.https.html");
   target_url.searchParams.set("is-loaded-in-fenced-frame", true);
 
   const frame_loaded_key = token();
   const child_frame_target = generateURL(target_url, [frame_loaded_key]);
 
   const source_url =
-      resolveUrl("resources/fenced-frame-local-network-access.https.html", sourceResolveOptions(source));
+      resolveUrl("resources/fenced-frame-private-network-access.https.html", sourceResolveOptions(source));
   source_url.searchParams.set("fenced_frame_url", child_frame_target);
 
   const urn = await generateURNFromFledge(source_url, []);
diff --git a/test/wpt/tests/fetch/private-network-access/window-open.tentative.https.window.js b/test/wpt/tests/fetch/private-network-access/window-open.tentative.https.window.js
new file mode 100644
index 00000000000..85b929f34d4
--- /dev/null
+++ b/test/wpt/tests/fetch/private-network-access/window-open.tentative.https.window.js
@@ -0,0 +1,200 @@
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/common/utils.js
+// META: script=resources/support.sub.js
+//
+// These tests verify that secure contexts can navigate iframes to less-public
+// address spaces iff the target server responds affirmatively to preflight
+// requests.
+
+setup(() => {
+  assert_true(window.isSecureContext);
+});
+
+// Source: secure local context.
+//
+// All fetches unaffected by Private Network Access.
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTPS_LOCAL },
+  target: { server: Server.HTTPS_LOCAL },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "local to local: no preflight required.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTPS_LOCAL },
+  target: { server: Server.HTTPS_PRIVATE },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "local to private: no preflight required.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTPS_LOCAL },
+  target: { server: Server.HTTPS_PUBLIC },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "local to public: no preflight required.");
+
+// Generates tests of preflight behavior for a single (source, target) pair.
+//
+// Scenarios:
+//
+// - parent navigates child:
+//   - preflight response has non-2xx HTTP code
+//   - preflight response is missing CORS headers
+//   - preflight response is missing the PNA-specific `Access-Control` header
+//   - success
+//
+function makePreflightTests({
+  key,
+  sourceName,
+  sourceServer,
+  sourceTreatAsPublic,
+  targetName,
+  targetServer,
+}) {
+  const prefix =
+      `${sourceName} to ${targetName}: `;
+
+  const source = {
+    server: sourceServer,
+    treatAsPublic: sourceTreatAsPublic,
+  };
+
+  promise_test_parallel(t => windowOpenTest(t, {
+    source,
+    target: {
+      server: targetServer,
+      behavior: { preflight: PreflightBehavior.failure() },
+    },
+    expected: WindowOpenTestResult.FAILURE,
+  }), prefix + "failed preflight.");
+
+  promise_test_parallel(t => windowOpenTest(t, {
+    source,
+    target: {
+      server: targetServer,
+      behavior: { preflight: PreflightBehavior.noCorsHeader(token()) },
+    },
+    expected: WindowOpenTestResult.FAILURE,
+  }), prefix + "missing CORS headers.");
+
+  promise_test_parallel(t => windowOpenTest(t, {
+    source,
+    target: {
+      server: targetServer,
+      behavior: { preflight: PreflightBehavior.noPnaHeader(token()) },
+    },
+    expected: WindowOpenTestResult.FAILURE,
+  }), prefix + "missing PNA header.");
+
+  promise_test_parallel(t => windowOpenTest(t, {
+    source,
+    target: {
+      server: targetServer,
+      behavior: { preflight: PreflightBehavior.success(token()) },
+    },
+    expected: WindowOpenTestResult.SUCCESS,
+  }), prefix + "success.");
+}
+
+// Source: private secure context.
+//
+// Fetches to the local address space require a successful preflight response
+// carrying a PNA-specific header.
+
+makePreflightTests({
+  sourceServer: Server.HTTPS_PRIVATE,
+  sourceName: 'private',
+  targetServer: Server.HTTPS_LOCAL,
+  targetName: 'local',
+});
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTPS_PRIVATE },
+  target: { server: Server.HTTPS_PRIVATE },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "private to private: no preflight required.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTPS_PRIVATE },
+  target: { server: Server.HTTPS_PUBLIC },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "private to public: no preflight required.");
+
+// Source: public secure context.
+//
+// Fetches to the local and private address spaces require a successful
+// preflight response carrying a PNA-specific header.
+
+makePreflightTests({
+  sourceServer: Server.HTTPS_PUBLIC,
+  sourceName: "public",
+  targetServer: Server.HTTPS_LOCAL,
+  targetName: "local",
+});
+
+makePreflightTests({
+  sourceServer: Server.HTTPS_PUBLIC,
+  sourceName: "public",
+  targetServer: Server.HTTPS_PRIVATE,
+  targetName: "private",
+});
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTPS_PUBLIC },
+  target: { server: Server.HTTPS_PUBLIC },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "public to public: no preflight required.");
+
+// The following tests verify that `CSP: treat-as-public-address` makes
+// documents behave as if they had been served from a public IP address.
+
+makePreflightTests({
+  sourceServer: Server.HTTPS_LOCAL,
+  sourceTreatAsPublic: true,
+  sourceName: "treat-as-public-address",
+  targetServer: Server.OTHER_HTTPS_LOCAL,
+  targetName: "local",
+});
+
+promise_test_parallel(
+    t => windowOpenTest(t, {
+      source: {
+        server: Server.HTTPS_LOCAL,
+        treatAsPublic: true,
+      },
+      target: {server: Server.HTTPS_LOCAL},
+      expected: WindowOpenTestResult.SUCCESS,
+    }),
+    'treat-as-public-address to local (same-origin): no preflight required.');
+
+makePreflightTests({
+  sourceServer: Server.HTTPS_LOCAL,
+  sourceTreatAsPublic: true,
+  sourceName: 'treat-as-public-address',
+  targetServer: Server.HTTPS_PRIVATE,
+  targetName: 'private',
+});
+
+promise_test_parallel(
+    t => windowOpenTest(t, {
+      source: {
+        server: Server.HTTPS_LOCAL,
+        treatAsPublic: true,
+      },
+      target: {server: Server.HTTPS_PUBLIC},
+      expected: WindowOpenTestResult.SUCCESS,
+    }),
+    'treat-as-public-address to public: no preflight required.');
+
+promise_test_parallel(
+    t => windowOpenTest(t, {
+      source: {
+        server: Server.HTTPS_LOCAL,
+        treatAsPublic: true,
+      },
+      target: {
+        server: Server.HTTPS_PUBLIC,
+        behavior: {preflight: PreflightBehavior.optionalSuccess(token())}
+      },
+      expected: WindowOpenTestResult.SUCCESS,
+    }),
+    'treat-as-public-address to local: optional preflight');
diff --git a/test/wpt/tests/fetch/private-network-access/window-open.tentative.window.js b/test/wpt/tests/fetch/private-network-access/window-open.tentative.window.js
new file mode 100644
index 00000000000..8d023775226
--- /dev/null
+++ b/test/wpt/tests/fetch/private-network-access/window-open.tentative.window.js
@@ -0,0 +1,94 @@
+// META: script=/common/dispatcher/dispatcher.js
+// META: script=/common/utils.js
+// META: script=resources/support.sub.js
+//
+// Spec: https://wicg.github.io/private-network-access/
+//
+// These tests verify that non-secure contexts cannot open a new window to
+// less-public address spaces.
+
+setup(() => {
+  // Making sure we are in a non secure context, as expected.
+  assert_false(window.isSecureContext);
+});
+
+promise_test(t => windowOpenTest(t, {
+  source: { server: Server.HTTP_LOCAL },
+  target: { server: Server.HTTP_LOCAL },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "local to local: no preflight required.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTP_LOCAL },
+  target: { server: Server.HTTP_PRIVATE },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "local to private: no preflight required.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTP_LOCAL },
+  target: { server: Server.HTTP_PUBLIC },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "local to public: no preflight required.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTP_PRIVATE },
+  target: { server: Server.HTTP_LOCAL },
+  expected: WindowOpenTestResult.FAILURE,
+}), "private to local: failure.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTP_PRIVATE },
+  target: { server: Server.HTTP_PRIVATE },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "private to private: no preflight required.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTP_PRIVATE },
+  target: { server: Server.HTTP_PUBLIC },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "private to public: no preflight required.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTP_PUBLIC },
+  target: { server: Server.HTTP_LOCAL },
+  expected: WindowOpenTestResult.FAILURE,
+}), "public to local: failure.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTP_PUBLIC },
+  target: { server: Server.HTTP_PRIVATE },
+  expected: WindowOpenTestResult.FAILURE,
+}), "public to private: failure.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: { server: Server.HTTP_PUBLIC },
+  target: { server: Server.HTTP_PUBLIC },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "public to public: no preflight required.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: {
+    server: Server.HTTP_LOCAL,
+    treatAsPublic: true,
+  },
+  target: { server: Server.HTTP_LOCAL },
+  expected: WindowOpenTestResult.FAILURE,
+}), "treat-as-public-address to local: failure.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: {
+    server: Server.HTTP_LOCAL,
+    treatAsPublic: true,
+  },
+  target: { server: Server.HTTP_PRIVATE },
+  expected: WindowOpenTestResult.FAILURE,
+}), "treat-as-public-address to private: failure.");
+
+promise_test_parallel(t => windowOpenTest(t, {
+  source: {
+    server: Server.HTTP_LOCAL,
+    treatAsPublic: true,
+  },
+  target: { server: Server.HTTP_PUBLIC },
+  expected: WindowOpenTestResult.SUCCESS,
+}), "treat-as-public-address to public: no preflight required.");
diff --git a/test/wpt/tests/interfaces/FedCM.idl b/test/wpt/tests/interfaces/FedCM.idl
index 8de87e88b05..9b18d951f83 100644
--- a/test/wpt/tests/interfaces/FedCM.idl
+++ b/test/wpt/tests/interfaces/FedCM.idl
@@ -3,6 +3,21 @@
 // (https://github.com/w3c/webref)
 // Source: Federated Credential Management API (https://fedidcg.github.io/FedCM/)
 
+enum LoginStatus {
+  "logged-in",
+  "logged-out",
+};
+
+[Exposed=Window, SecureContext]
+
+interface NavigatorLogin {
+  Promise<undefined> setStatus(LoginStatus status);
+};
+
+partial interface Navigator {
+  [SecureContext] readonly attribute NavigatorLogin login;
+};
+
 [Exposed=Window, SecureContext]
 interface IdentityCredential : Credential {
   readonly attribute USVString? token;
@@ -12,14 +27,23 @@ partial dictionary CredentialRequestOptions {
   IdentityCredentialRequestOptions identity;
 };
 
+enum IdentityCredentialRequestOptionsContext {
+  "signin",
+  "signup",
+  "use",
+  "continue"
+};
+
 dictionary IdentityCredentialRequestOptions {
-  sequence<IdentityProviderConfig> providers;
+  required sequence<IdentityProviderConfig> providers;
+  IdentityCredentialRequestOptionsContext context = "signin";
 };
 
 dictionary IdentityProviderConfig {
   required USVString configURL;
   required USVString clientId;
   USVString nonce;
+  DOMString loginHint;
 };
 
 dictionary IdentityProviderWellKnown {
@@ -42,6 +66,7 @@ dictionary IdentityProviderAPIConfig {
   required USVString accounts_endpoint;
   required USVString client_metadata_endpoint;
   required USVString id_assertion_endpoint;
+  required USVString login_url;
   IdentityProviderBranding branding;
 };
 
@@ -52,6 +77,7 @@ dictionary IdentityProviderAccount {
   USVString given_name;
   USVString picture;
   sequence<USVString> approved_clients;
+  sequence<DOMString> login_hints;
 };
 dictionary IdentityProviderAccountList {
   sequence<IdentityProviderAccount> accounts;
@@ -65,3 +91,15 @@ dictionary IdentityProviderClientMetadata {
   USVString privacy_policy_url;
   USVString terms_of_service_url;
 };
+
+dictionary IdentityUserInfo {
+  USVString email;
+  USVString name;
+  USVString givenName;
+  USVString picture;
+};
+
+[Exposed=Window, SecureContext] interface IdentityProvider {
+    static undefined close();
+    static Promise<sequence<IdentityUserInfo>> getUserInfo(IdentityProviderConfig config);
+};
diff --git a/test/wpt/tests/interfaces/WEBGL_clip_cull_distance.idl b/test/wpt/tests/interfaces/WEBGL_clip_cull_distance.idl
index 46fa921fd53..a3a6dd869f9 100644
--- a/test/wpt/tests/interfaces/WEBGL_clip_cull_distance.idl
+++ b/test/wpt/tests/interfaces/WEBGL_clip_cull_distance.idl
@@ -1,7 +1,7 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into webref
 // (https://github.com/w3c/webref)
-// Source: WebGL WEBGL_clip_cull_distance Extension Draft Specification (https://registry.khronos.org/webgl/extensions/WEBGL_clip_cull_distance/)
+// Source: WebGL WEBGL_clip_cull_distance Extension Specification (https://registry.khronos.org/webgl/extensions/WEBGL_clip_cull_distance/)
 
 [Exposed=(Window,Worker), LegacyNoInterfaceObject]
 interface WEBGL_clip_cull_distance {
diff --git a/test/wpt/tests/interfaces/WEBGL_multi_draw.idl b/test/wpt/tests/interfaces/WEBGL_multi_draw.idl
index ee8c044b529..fc2270029b1 100644
--- a/test/wpt/tests/interfaces/WEBGL_multi_draw.idl
+++ b/test/wpt/tests/interfaces/WEBGL_multi_draw.idl
@@ -7,26 +7,26 @@
 interface WEBGL_multi_draw {
   undefined multiDrawArraysWEBGL(
       GLenum mode,
-      ([AllowShared] Int32Array or sequence<GLint>) firstsList, GLuint firstsOffset,
-      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, GLuint countsOffset,
+      ([AllowShared] Int32Array or sequence<GLint>) firstsList, unsigned long long firstsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, unsigned long long countsOffset,
       GLsizei drawcount);
   undefined multiDrawElementsWEBGL(
       GLenum mode,
-      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, GLuint countsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, unsigned long long countsOffset,
       GLenum type,
-      ([AllowShared] Int32Array or sequence<GLsizei>) offsetsList, GLuint offsetsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) offsetsList, unsigned long long offsetsOffset,
       GLsizei drawcount);
   undefined multiDrawArraysInstancedWEBGL(
       GLenum mode,
-      ([AllowShared] Int32Array or sequence<GLint>) firstsList, GLuint firstsOffset,
-      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, GLuint countsOffset,
-      ([AllowShared] Int32Array or sequence<GLsizei>) instanceCountsList, GLuint instanceCountsOffset,
+      ([AllowShared] Int32Array or sequence<GLint>) firstsList, unsigned long long firstsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, unsigned long long countsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) instanceCountsList, unsigned long long instanceCountsOffset,
       GLsizei drawcount);
   undefined multiDrawElementsInstancedWEBGL(
       GLenum mode,
-      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, GLuint countsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, unsigned long long countsOffset,
       GLenum type,
-      ([AllowShared] Int32Array or sequence<GLsizei>) offsetsList, GLuint offsetsOffset,
-      ([AllowShared] Int32Array or sequence<GLsizei>) instanceCountsList, GLuint instanceCountsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) offsetsList, unsigned long long offsetsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) instanceCountsList, unsigned long long instanceCountsOffset,
       GLsizei drawcount);
 };
diff --git a/test/wpt/tests/interfaces/WEBGL_multi_draw_instanced_base_vertex_base_instance.idl b/test/wpt/tests/interfaces/WEBGL_multi_draw_instanced_base_vertex_base_instance.idl
index 2258fa9a10c..7e4515cc36b 100644
--- a/test/wpt/tests/interfaces/WEBGL_multi_draw_instanced_base_vertex_base_instance.idl
+++ b/test/wpt/tests/interfaces/WEBGL_multi_draw_instanced_base_vertex_base_instance.idl
@@ -7,20 +7,20 @@
 interface WEBGL_multi_draw_instanced_base_vertex_base_instance {
   undefined multiDrawArraysInstancedBaseInstanceWEBGL(
       GLenum mode,
-      ([AllowShared] Int32Array or sequence<GLint>) firstsList, GLuint firstsOffset,
-      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, GLuint countsOffset,
-      ([AllowShared] Int32Array or sequence<GLsizei>) instanceCountsList, GLuint instanceCountsOffset,
-      ([AllowShared] Uint32Array or sequence<GLuint>) baseInstancesList, GLuint baseInstancesOffset,
+      ([AllowShared] Int32Array or sequence<GLint>) firstsList, unsigned long long firstsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, unsigned long long countsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) instanceCountsList, unsigned long long instanceCountsOffset,
+      ([AllowShared] Uint32Array or sequence<GLuint>) baseInstancesList, unsigned long long baseInstancesOffset,
       GLsizei drawcount
   );
   undefined multiDrawElementsInstancedBaseVertexBaseInstanceWEBGL(
       GLenum mode,
-      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, GLuint countsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) countsList, unsigned long long countsOffset,
       GLenum type,
-      ([AllowShared] Int32Array or sequence<GLsizei>) offsetsList, GLuint offsetsOffset,
-      ([AllowShared] Int32Array or sequence<GLsizei>) instanceCountsList, GLuint instanceCountsOffset,
-      ([AllowShared] Int32Array or sequence<GLint>) baseVerticesList, GLuint baseVerticesOffset,
-      ([AllowShared] Uint32Array or sequence<GLuint>) baseInstancesList, GLuint baseInstancesOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) offsetsList, unsigned long long offsetsOffset,
+      ([AllowShared] Int32Array or sequence<GLsizei>) instanceCountsList, unsigned long long instanceCountsOffset,
+      ([AllowShared] Int32Array or sequence<GLint>) baseVerticesList, unsigned long long baseVerticesOffset,
+      ([AllowShared] Uint32Array or sequence<GLuint>) baseInstancesList, unsigned long long baseInstancesOffset,
       GLsizei drawcount
   );
 };
diff --git a/test/wpt/tests/interfaces/accelerometer.idl b/test/wpt/tests/interfaces/accelerometer.idl
index fc8fc07ff77..a082224dc88 100644
--- a/test/wpt/tests/interfaces/accelerometer.idl
+++ b/test/wpt/tests/interfaces/accelerometer.idl
@@ -26,15 +26,3 @@ interface LinearAccelerationSensor : Accelerometer {
 interface GravitySensor : Accelerometer {
   constructor(optional AccelerometerSensorOptions options = {});
 };
-
-dictionary AccelerometerReadingValues {
-  required double? x;
-  required double? y;
-  required double? z;
-};
-
-dictionary LinearAccelerationReadingValues : AccelerometerReadingValues {
-};
-
-dictionary GravityReadingValues : AccelerometerReadingValues {
-};
diff --git a/test/wpt/tests/interfaces/ambient-light.idl b/test/wpt/tests/interfaces/ambient-light.idl
index 6d9c8e03eaa..011cd934fce 100644
--- a/test/wpt/tests/interfaces/ambient-light.idl
+++ b/test/wpt/tests/interfaces/ambient-light.idl
@@ -8,7 +8,3 @@ interface AmbientLightSensor : Sensor {
   constructor(optional SensorOptions sensorOptions = {});
   readonly attribute double? illuminance;
 };
-
-dictionary AmbientLightReadingValues {
-  required double? illuminance;
-};
diff --git a/test/wpt/tests/interfaces/audio-session.idl b/test/wpt/tests/interfaces/audio-session.idl
new file mode 100644
index 00000000000..f542347c710
--- /dev/null
+++ b/test/wpt/tests/interfaces/audio-session.idl
@@ -0,0 +1,33 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Audio Session (https://w3c.github.io/audio-session/)
+
+enum AudioSessionState {
+  "inactive",
+  "active",
+  "interrupted"
+};
+
+enum AudioSessionType {
+  "auto",
+  "playback",
+  "transient",
+  "transient-solo",
+  "ambient",
+  "play-and-record"
+};
+
+[Exposed=Window]
+partial interface Navigator {
+  // The default audio session that the user agent will use when media elements start/stop playing.
+  readonly attribute AudioSession audioSession;
+};
+
+[Exposed=Window]
+interface AudioSession : EventTarget {
+  attribute AudioSessionType type;
+
+  readonly attribute AudioSessionState state;
+  attribute EventHandler onstatechange;
+};
diff --git a/test/wpt/tests/interfaces/captured-mouse-events.idl b/test/wpt/tests/interfaces/captured-mouse-events.idl
new file mode 100644
index 00000000000..64c73b906d5
--- /dev/null
+++ b/test/wpt/tests/interfaces/captured-mouse-events.idl
@@ -0,0 +1,20 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Captured Mouse Events (https://screen-share.github.io/captured-mouse-events/)
+
+[Exposed=Window]
+interface CapturedMouseEvent : Event {
+  constructor(DOMString type, optional CapturedMouseEventInit eventInitDict = {});
+  readonly attribute long surfaceX;
+  readonly attribute long surfaceY;
+};
+
+dictionary CapturedMouseEventInit : EventInit {
+  long surfaceX = -1;
+  long surfaceY = -1;
+};
+
+partial interface CaptureController {
+  attribute EventHandler oncapturedmousechange;
+};
diff --git a/test/wpt/tests/interfaces/clipboard-apis.idl b/test/wpt/tests/interfaces/clipboard-apis.idl
index 3f2c9ba6f28..594484ced62 100644
--- a/test/wpt/tests/interfaces/clipboard-apis.idl
+++ b/test/wpt/tests/interfaces/clipboard-apis.idl
@@ -28,6 +28,8 @@ interface ClipboardItem {
   readonly attribute FrozenArray<DOMString> types;
 
   Promise<Blob> getType(DOMString type);
+
+  static boolean supports(DOMString type);
 };
 
 enum PresentationStyle { "unspecified", "inline", "attachment" };
@@ -40,12 +42,16 @@ typedef sequence<ClipboardItem> ClipboardItems;
 
 [SecureContext, Exposed=Window]
 interface Clipboard : EventTarget {
-  Promise<ClipboardItems> read();
+  Promise<ClipboardItems> read(optional ClipboardUnsanitizedFormats formats = {});
   Promise<DOMString> readText();
   Promise<undefined> write(ClipboardItems data);
   Promise<undefined> writeText(DOMString data);
 };
 
+dictionary ClipboardUnsanitizedFormats {
+  sequence<DOMString> unsanitized;
+};
+
 dictionary ClipboardPermissionDescriptor : PermissionDescriptor {
   boolean allowWithoutGesture = false;
 };
diff --git a/test/wpt/tests/interfaces/close-watcher.idl b/test/wpt/tests/interfaces/close-watcher.idl
deleted file mode 100644
index de7940c07e7..00000000000
--- a/test/wpt/tests/interfaces/close-watcher.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into webref
-// (https://github.com/w3c/webref)
-// Source: Close Watcher API (https://wicg.github.io/close-watcher/)
-
-[Exposed=Window]
-interface CloseWatcher : EventTarget {
-  constructor(optional CloseWatcherOptions options = {});
-
-  undefined destroy();
-  undefined close();
-
-  attribute EventHandler oncancel;
-  attribute EventHandler onclose;
-};
-
-dictionary CloseWatcherOptions {
-  AbortSignal signal;
-};
diff --git a/test/wpt/tests/interfaces/cookie-store.idl b/test/wpt/tests/interfaces/cookie-store.idl
index f44b4c63546..8a000cac0b2 100644
--- a/test/wpt/tests/interfaces/cookie-store.idl
+++ b/test/wpt/tests/interfaces/cookie-store.idl
@@ -40,12 +40,14 @@ dictionary CookieInit {
   USVString? domain = null;
   USVString path = "/";
   CookieSameSite sameSite = "strict";
+  boolean partitioned = false;
 };
 
 dictionary CookieStoreDeleteOptions {
   required USVString name;
   USVString? domain = null;
   USVString path = "/";
+  boolean partitioned = false;
 };
 
 dictionary CookieListItem {
@@ -56,6 +58,7 @@ dictionary CookieListItem {
   DOMHighResTimeStamp? expires;
   boolean secure;
   CookieSameSite sameSite;
+  boolean partitioned;
 };
 
 typedef sequence<CookieListItem> CookieList;
diff --git a/test/wpt/tests/interfaces/credential-management.idl b/test/wpt/tests/interfaces/credential-management.idl
index e9fab13f35f..75e18319190 100644
--- a/test/wpt/tests/interfaces/credential-management.idl
+++ b/test/wpt/tests/interfaces/credential-management.idl
@@ -23,7 +23,7 @@ partial interface Navigator {
 [Exposed=Window, SecureContext]
 interface CredentialsContainer {
   Promise<Credential?> get(optional CredentialRequestOptions options = {});
-  Promise<Credential> store(Credential credential);
+  Promise<undefined> store(Credential credential);
   Promise<Credential?> create(optional CredentialCreationOptions options = {});
   Promise<undefined> preventSilentAccess();
 };
diff --git a/test/wpt/tests/interfaces/css-anchor-position.idl b/test/wpt/tests/interfaces/css-anchor-position.idl
index c5da3f43f72..5d3973eff3d 100644
--- a/test/wpt/tests/interfaces/css-anchor-position.idl
+++ b/test/wpt/tests/interfaces/css-anchor-position.idl
@@ -1,3 +1,6 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
 // Source: CSS Anchor Positioning (https://drafts.csswg.org/css-anchor-position-1/)
 
 [Exposed=Window]
diff --git a/test/wpt/tests/interfaces/css-font-loading.idl b/test/wpt/tests/interfaces/css-font-loading.idl
index 6f2e16dd641..100f1f7fed5 100644
--- a/test/wpt/tests/interfaces/css-font-loading.idl
+++ b/test/wpt/tests/interfaces/css-font-loading.idl
@@ -10,7 +10,6 @@ dictionary FontFaceDescriptors {
   CSSOMString weight = "normal";
   CSSOMString stretch = "normal";
   CSSOMString unicodeRange = "U+0-10FFFF";
-  CSSOMString variant = "normal";
   CSSOMString featureSettings = "normal";
   CSSOMString variationSettings = "normal";
   CSSOMString display = "auto";
@@ -30,7 +29,6 @@ interface FontFace {
   attribute CSSOMString weight;
   attribute CSSOMString stretch;
   attribute CSSOMString unicodeRange;
-  attribute CSSOMString variant;
   attribute CSSOMString featureSettings;
   attribute CSSOMString variationSettings;
   attribute CSSOMString display;
diff --git a/test/wpt/tests/interfaces/css-fonts.idl b/test/wpt/tests/interfaces/css-fonts.idl
index eddfc025215..070cbc58f5d 100644
--- a/test/wpt/tests/interfaces/css-fonts.idl
+++ b/test/wpt/tests/interfaces/css-fonts.idl
@@ -5,7 +5,7 @@
 
 [Exposed=Window]
 interface CSSFontFaceRule : CSSRule {
-    readonly attribute CSSStyleDeclaration style;
+  readonly attribute CSSStyleDeclaration style;
 };
 
 partial interface CSSRule {  const unsigned short FONT_FEATURE_VALUES_RULE = 14;
@@ -25,7 +25,7 @@ interface CSSFontFeatureValuesRule : CSSRule {
 interface CSSFontFeatureValuesMap {
   maplike<CSSOMString, sequence<unsigned long>>;
   undefined set(CSSOMString featureValueName,
-           (unsigned long or sequence<unsigned long>) values);
+         (unsigned long or sequence<unsigned long>) values);
 };
 
 [Exposed=Window]interface CSSFontPaletteValuesRule : CSSRule {
diff --git a/test/wpt/tests/interfaces/css-nesting.idl b/test/wpt/tests/interfaces/css-nesting.idl
deleted file mode 100644
index 01f27ab9d65..00000000000
--- a/test/wpt/tests/interfaces/css-nesting.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into webref
-// (https://github.com/w3c/webref)
-// Source: CSS Nesting Module (https://drafts.csswg.org/css-nesting-1/)
-
-partial interface CSSStyleRule {
-  [SameObject] readonly attribute CSSRuleList cssRules;
-  unsigned long insertRule(CSSOMString rule, optional unsigned long index = 0);
-  undefined deleteRule(unsigned long index);
-};
diff --git a/test/wpt/tests/interfaces/css-toggle.tentative.idl b/test/wpt/tests/interfaces/css-toggle.tentative.idl
deleted file mode 100644
index 5587019a290..00000000000
--- a/test/wpt/tests/interfaces/css-toggle.tentative.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-partial interface Element {
-  [SameObject] readonly attribute CSSToggleMap toggles;
-};
-
-interface CSSToggleMap {
-  maplike<DOMString, CSSToggle>;
-  CSSToggleMap set(DOMString key, CSSToggle value);
-};
-
-interface CSSToggle {
-  attribute (unsigned long or DOMString) value;
-  attribute unsigned long? valueAsNumber;
-  attribute DOMString? valueAsString;
-
-  attribute (unsigned long or FrozenArray<DOMString>) states;
-  attribute boolean group;
-  attribute CSSToggleScope scope;
-  attribute CSSToggleCycle cycle;
-
-  constructor(optional CSSToggleData options);
-};
-
-dictionary CSSToggleData {
-  (unsigned long or DOMString) value = 0;
-  (unsigned long or sequence<DOMString>) states = 1;
-  boolean group = false;
-  CSSToggleScope scope = "wide";
-  CSSToggleCycle cycle = "cycle";
-};
-
-enum CSSToggleScope {
-  "narrow",
-  "wide",
-};
-
-enum CSSToggleCycle {
-  "cycle",
-  "cycle-on",
-  "sticky",
-};
-
-interface CSSToggleEvent : Event {
-  constructor(DOMString type, optional CSSToggleEventInit eventInitDict = {});
-  readonly attribute DOMString toggleName;
-  readonly attribute CSSToggle? toggle;
-};
-
-dictionary CSSToggleEventInit : EventInit {
-  DOMString toggleName = "";
-  CSSToggle? toggle = null;
-};
diff --git a/test/wpt/tests/interfaces/css-transitions-2.idl b/test/wpt/tests/interfaces/css-transitions-2.idl
index 9d06f3cf260..223810f761e 100644
--- a/test/wpt/tests/interfaces/css-transitions-2.idl
+++ b/test/wpt/tests/interfaces/css-transitions-2.idl
@@ -3,6 +3,10 @@
 // (https://github.com/w3c/webref)
 // Source: CSS Transitions Level 2 (https://drafts.csswg.org/css-transitions-2/)
 
+[Exposed=Window]
+interface CSSStartingStyleRule : CSSGroupingRule {
+};
+
 [Exposed=Window]
 interface CSSTransition : Animation {
   readonly attribute CSSOMString transitionProperty;
diff --git a/test/wpt/tests/interfaces/css-typed-om.idl b/test/wpt/tests/interfaces/css-typed-om.idl
index 0df6a0327a2..b0f26ea83c7 100644
--- a/test/wpt/tests/interfaces/css-typed-om.idl
+++ b/test/wpt/tests/interfaces/css-typed-om.idl
@@ -184,12 +184,17 @@ partial namespace CSS {
     CSSUnitValue percent(double value);
 
     // <length>
+    CSSUnitValue cap(double value);
+    CSSUnitValue ch(double value);
     CSSUnitValue em(double value);
     CSSUnitValue ex(double value);
-    CSSUnitValue ch(double value);
     CSSUnitValue ic(double value);
-    CSSUnitValue rem(double value);
     CSSUnitValue lh(double value);
+    CSSUnitValue rcap(double value);
+    CSSUnitValue rch(double value);
+    CSSUnitValue rem(double value);
+    CSSUnitValue rex(double value);
+    CSSUnitValue ric(double value);
     CSSUnitValue rlh(double value);
     CSSUnitValue vw(double value);
     CSSUnitValue vh(double value);
diff --git a/test/wpt/tests/interfaces/css-view-transitions-2.idl b/test/wpt/tests/interfaces/css-view-transitions-2.idl
new file mode 100644
index 00000000000..fe1f0e30e7d
--- /dev/null
+++ b/test/wpt/tests/interfaces/css-view-transitions-2.idl
@@ -0,0 +1,30 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: CSS View Transitions Module Level 2 (https://drafts.csswg.org/css-view-transitions-2/)
+
+[Exposed=Window]
+interface PageRevealEvent : Event {
+  readonly attribute ViewTransition? viewTransition;
+};
+
+dictionary StartViewTransitionOptions {
+  UpdateCallback? update = null;
+  sequence<DOMString>? type = null;
+};
+
+partial interface Document {
+
+  ViewTransition startViewTransition(optional (UpdateCallback or StartViewTransitionOptions) callbackOptions = {});
+};
+
+partial interface CSSRule {
+  const unsigned short VIEW_TRANSITION_RULE = 15;
+};
+
+enum ViewTransitionNavigation { "auto", "none" };
+[Exposed=Window]
+interface CSSViewTransitionRule : CSSRule {
+  attribute ViewTransitionNavigation navigation;
+  attribute DOMTokenList type;
+};
diff --git a/test/wpt/tests/interfaces/css-view-transitions.idl b/test/wpt/tests/interfaces/css-view-transitions.idl
index 745eb1d9691..ce39b7dcfce 100644
--- a/test/wpt/tests/interfaces/css-view-transitions.idl
+++ b/test/wpt/tests/interfaces/css-view-transitions.idl
@@ -3,10 +3,6 @@
 // (https://github.com/w3c/webref)
 // Source: CSS View Transitions Module Level 1 (https://drafts.csswg.org/css-view-transitions-1/)
 
-partial interface Document {
-  ViewTransition startViewTransition(optional UpdateCallback? updateCallback = null);
-};
-
 callback UpdateCallback = Promise<any> ();
 
 [Exposed=Window]
diff --git a/test/wpt/tests/interfaces/cssom.idl b/test/wpt/tests/interfaces/cssom.idl
index 0574f1a771c..94cd1912b91 100644
--- a/test/wpt/tests/interfaces/cssom.idl
+++ b/test/wpt/tests/interfaces/cssom.idl
@@ -96,6 +96,12 @@ interface CSSRule {
   const unsigned short NAMESPACE_RULE = 10;
 };
 
+[Exposed=Window]
+interface CSSStyleRule : CSSGroupingRule {
+  attribute CSSOMString selectorText;
+  [SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
+};
+
 [Exposed=Window]
 interface CSSImportRule : CSSRule {
   readonly attribute USVString href;
@@ -112,12 +118,6 @@ interface CSSGroupingRule : CSSRule {
   undefined deleteRule(unsigned long index);
 };
 
-[Exposed=Window]
-interface CSSStyleRule : CSSGroupingRule {
-  attribute CSSOMString selectorText;
-  [SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
-};
-
 [Exposed=Window]
 interface CSSPageRule : CSSGroupingRule {
            attribute CSSOMString selectorText;
diff --git a/test/wpt/tests/interfaces/document-picture-in-picture.idl b/test/wpt/tests/interfaces/document-picture-in-picture.idl
index 742f65e6f06..f54f437a936 100644
--- a/test/wpt/tests/interfaces/document-picture-in-picture.idl
+++ b/test/wpt/tests/interfaces/document-picture-in-picture.idl
@@ -20,10 +20,9 @@ interface DocumentPictureInPicture : EventTarget {
 dictionary DocumentPictureInPictureOptions {
   [EnforceRange] unsigned long long width = 0;
   [EnforceRange] unsigned long long height = 0;
-  boolean copyStyleSheets = false;
 };
 
-[Exposed=Window]
+[Exposed=Window, SecureContext]
 interface DocumentPictureInPictureEvent : Event {
   constructor(DOMString type, DocumentPictureInPictureEventInit eventInitDict);
   [SameObject] readonly attribute Window window;
diff --git a/test/wpt/tests/interfaces/dom.idl b/test/wpt/tests/interfaces/dom.idl
index c2def872fa2..929fa8d03b3 100644
--- a/test/wpt/tests/interfaces/dom.idl
+++ b/test/wpt/tests/interfaces/dom.idl
@@ -396,6 +396,7 @@ dictionary ShadowRootInit {
   required ShadowRootMode mode;
   boolean delegatesFocus = false;
   SlotAssignmentMode slotAssignment = "named";
+  boolean clonable = false;
 };
 
 [Exposed=Window,
diff --git a/test/wpt/tests/interfaces/edit-context.idl b/test/wpt/tests/interfaces/edit-context.idl
index 91d8af2ea68..eb3174e25f5 100644
--- a/test/wpt/tests/interfaces/edit-context.idl
+++ b/test/wpt/tests/interfaces/edit-context.idl
@@ -24,16 +24,11 @@ interface EditContext : EventTarget {
     undefined updateSelectionBounds(DOMRect selectionBounds);
     undefined updateCharacterBounds(unsigned long rangeStart, sequence<DOMRect> characterBounds);
 
-    sequence<Element> attachedElements();
+    sequence<HTMLElement> attachedElements();
 
     readonly attribute DOMString text;
     readonly attribute unsigned long selectionStart;
     readonly attribute unsigned long selectionEnd;
-    readonly attribute unsigned long compositionRangeStart;
-    readonly attribute unsigned long compositionRangeEnd;
-    readonly attribute boolean isComposing;
-    readonly attribute DOMRect controlBounds;
-    readonly attribute DOMRect selectionBounds;
     readonly attribute unsigned long characterBoundsRangeStart;
     sequence<DOMRect> characterBounds();
 
@@ -62,18 +57,16 @@ interface TextUpdateEvent : Event {
     readonly attribute DOMString text;
     readonly attribute unsigned long selectionStart;
     readonly attribute unsigned long selectionEnd;
-    readonly attribute unsigned long compositionStart;
-    readonly attribute unsigned long compositionEnd;
 };
 
+enum UnderlineStyle { "none", "solid", "double", "dotted", "dashed", "wavy" };
+enum UnderlineThickness { "none", "thin", "thick" };
+
 dictionary TextFormatInit {
     unsigned long rangeStart;
     unsigned long rangeEnd;
-    DOMString textColor;
-    DOMString backgroundColor;
-    DOMString underlineStyle;
-    DOMString underlineThickness;
-    DOMString underlineColor;
+    UnderlineStyle underlineStyle;
+    UnderlineThickness underlineThickness;
 };
 
 [Exposed=Window]
@@ -81,11 +74,8 @@ interface TextFormat {
     constructor(optional TextFormatInit options = {});
     readonly attribute unsigned long rangeStart;
     readonly attribute unsigned long rangeEnd;
-    readonly attribute DOMString textColor;
-    readonly attribute DOMString backgroundColor;
-    readonly attribute DOMString underlineStyle;
-    readonly attribute DOMString underlineThickness;
-    readonly attribute DOMString underlineColor;
+    readonly attribute UnderlineStyle underlineStyle;
+    readonly attribute UnderlineThickness underlineThickness;
 };
 
 dictionary TextFormatUpdateEventInit : EventInit {
diff --git a/test/wpt/tests/interfaces/element-capture.idl b/test/wpt/tests/interfaces/element-capture.idl
new file mode 100644
index 00000000000..619a0fd2f44
--- /dev/null
+++ b/test/wpt/tests/interfaces/element-capture.idl
@@ -0,0 +1,14 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Element Capture (https://screen-share.github.io/element-capture/)
+
+[Exposed=(Window,Worker), Serializable]
+interface RestrictionTarget {
+  [Exposed=Window, SecureContext] static Promise<RestrictionTarget> fromElement(Element element);
+};
+
+[Exposed = Window]
+partial interface BrowserCaptureMediaStreamTrack {
+  Promise<undefined> restrictTo(RestrictionTarget? RestrictionTarget);
+};
diff --git a/test/wpt/tests/interfaces/encoding.idl b/test/wpt/tests/interfaces/encoding.idl
index a8cbe4431a2..a9499f62378 100644
--- a/test/wpt/tests/interfaces/encoding.idl
+++ b/test/wpt/tests/interfaces/encoding.idl
@@ -22,7 +22,7 @@ dictionary TextDecodeOptions {
 interface TextDecoder {
   constructor(optional DOMString label = "utf-8", optional TextDecoderOptions options = {});
 
-  USVString decode(optional [AllowShared] BufferSource input, optional TextDecodeOptions options = {});
+  USVString decode(optional AllowSharedBufferSource input, optional TextDecodeOptions options = {});
 };
 TextDecoder includes TextDecoderCommon;
 
diff --git a/test/wpt/tests/interfaces/encrypted-media.idl b/test/wpt/tests/interfaces/encrypted-media.idl
index 24db48ecf9c..f5d5aa8d6c0 100644
--- a/test/wpt/tests/interfaces/encrypted-media.idl
+++ b/test/wpt/tests/interfaces/encrypted-media.idl
@@ -43,9 +43,26 @@ enum MediaKeySessionType {
 
 [Exposed=Window, SecureContext] interface MediaKeys {
     MediaKeySession  createSession (optional MediaKeySessionType sessionType = "temporary");
+    Promise<MediaKeyStatus> getStatusForPolicy (optional MediaKeysPolicy policy = {});
     Promise<boolean> setServerCertificate (BufferSource serverCertificate);
 };
 
+dictionary MediaKeysPolicy {
+    HDCPVersion minHdcpVersion;
+};
+
+enum HDCPVersion {
+    "1.0",
+    "1.1",
+    "1.2",
+    "1.3",
+    "1.4",
+    "2.0",
+    "2.1",
+    "2.2",
+    "2.3",
+};
+
 enum MediaKeySessionClosedReason {
     "internal-error",
     "closed-by-application",
diff --git a/test/wpt/tests/interfaces/event-timing.idl b/test/wpt/tests/interfaces/event-timing.idl
index 741a05dc6bc..ad2cb7b831c 100644
--- a/test/wpt/tests/interfaces/event-timing.idl
+++ b/test/wpt/tests/interfaces/event-timing.idl
@@ -1,7 +1,7 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into webref
 // (https://github.com/w3c/webref)
-// Source: Event Timing API (https://w3c.github.io/event-timing)
+// Source: Event Timing API (https://w3c.github.io/event-timing/)
 
 [Exposed=Window]
 interface PerformanceEventTiming : PerformanceEntry {
diff --git a/test/wpt/tests/interfaces/fenced-frame.idl b/test/wpt/tests/interfaces/fenced-frame.idl
index 440ec2bbaa1..0eed6a6b4ba 100644
--- a/test/wpt/tests/interfaces/fenced-frame.idl
+++ b/test/wpt/tests/interfaces/fenced-frame.idl
@@ -18,7 +18,7 @@ enum OpaqueProperty {"opaque"};
 typedef (unsigned long or OpaqueProperty) FencedFrameConfigSize;
 typedef USVString FencedFrameConfigURL;
 
-[Exposed=Window]
+[Exposed=Window, Serializable]
 interface FencedFrameConfig {
   readonly attribute FencedFrameConfigSize? containerWidth;
   readonly attribute FencedFrameConfigSize? containerHeight;
@@ -28,6 +28,13 @@ interface FencedFrameConfig {
   undefined setSharedStorageContext(DOMString contextString);
 };
 
+typedef (USVString or FencedFrameConfig) UrnOrConfig;
+
+partial interface Navigator {
+  Promise<undefined> deprecatedReplaceInURN(
+    UrnOrConfig urnOrConfig, record<USVString, USVString> replacements);
+};
+
 enum FenceReportingDestination {
   "buyer",
   "seller",
@@ -37,17 +44,27 @@ enum FenceReportingDestination {
 };
 
 dictionary FenceEvent {
-  required DOMString eventType;
-  required DOMString eventData;
-  required sequence<FenceReportingDestination> destination;
+  // This dictionary has two mutually exclusive modes that aren’t represented as
+  // distinct IDL types due to distinguishability issues:
+  //
+  // When reporting to a preregistered destination (specified by enum), the following
+  // properties are used:
+  DOMString eventType;
+  DOMString eventData;
+  sequence<FenceReportingDestination> destination;
+  boolean once = false;
+
+  // When reporting to a custom destination URL (with substitution of macros defined by
+  // the Protected Audience buyer), the following property is used:
+  USVString destinationURL;
 };
 
 typedef (FenceEvent or DOMString) ReportEventType;
 
 [Exposed=Window]
 interface Fence {
-    undefined reportEvent(ReportEventType event);
-    undefined setReportEventDataForAutomaticBeacons(FenceEvent event);
+    undefined reportEvent(optional ReportEventType event = {});
+    undefined setReportEventDataForAutomaticBeacons(optional FenceEvent event = {});
     sequence<FencedFrameConfig> getNestedConfigs();
 };
 
diff --git a/test/wpt/tests/interfaces/fetch.idl b/test/wpt/tests/interfaces/fetch.idl
index 81a5e69aee5..5038aeba6cd 100644
--- a/test/wpt/tests/interfaces/fetch.idl
+++ b/test/wpt/tests/interfaces/fetch.idl
@@ -76,7 +76,7 @@ dictionary RequestInit {
   any window; // can only be set to null
 };
 
-enum RequestDestination { "", "audio", "audioworklet", "document", "embed", "font", "frame", "iframe", "image", "manifest", "object", "paintworklet", "report", "script", "sharedworker", "style",  "track", "video", "worker", "xslt" };
+enum RequestDestination { "", "audio", "audioworklet", "document", "embed", "font", "frame", "iframe", "image", "json", "manifest", "object", "paintworklet", "report", "script", "sharedworker", "style",  "track", "video", "worker", "xslt" };
 enum RequestMode { "navigate", "same-origin", "no-cors", "cors" };
 enum RequestCredentials { "omit", "same-origin", "include" };
 enum RequestCache { "default", "no-store", "reload", "no-cache", "force-cache", "only-if-cached" };
diff --git a/test/wpt/tests/interfaces/file-system-access.idl b/test/wpt/tests/interfaces/file-system-access.idl
index 572f9342a40..f1d86065072 100644
--- a/test/wpt/tests/interfaces/file-system-access.idl
+++ b/test/wpt/tests/interfaces/file-system-access.idl
@@ -35,7 +35,7 @@ enum WellKnownDirectory {
 typedef (WellKnownDirectory or FileSystemHandle) StartInDirectory;
 
 dictionary FilePickerAcceptType {
-    USVString description;
+    USVString description = "";
     record<USVString, (USVString or sequence<USVString>)> accept;
 };
 
diff --git a/test/wpt/tests/interfaces/fs.idl b/test/wpt/tests/interfaces/fs.idl
index e341ab387d9..46a59dd1acd 100644
--- a/test/wpt/tests/interfaces/fs.idl
+++ b/test/wpt/tests/interfaces/fs.idl
@@ -80,9 +80,9 @@ dictionary FileSystemReadWriteOptions {
 
 [Exposed=DedicatedWorker, SecureContext]
 interface FileSystemSyncAccessHandle {
-  unsigned long long read([AllowShared] BufferSource buffer,
+  unsigned long long read(AllowSharedBufferSource buffer,
                           optional FileSystemReadWriteOptions options = {});
-  unsigned long long write([AllowShared] BufferSource buffer,
+  unsigned long long write(AllowSharedBufferSource buffer,
                            optional FileSystemReadWriteOptions options = {});
 
   undefined truncate([EnforceRange] unsigned long long newSize);
diff --git a/test/wpt/tests/interfaces/generic-sensor.idl b/test/wpt/tests/interfaces/generic-sensor.idl
index 157072f6341..a997bb62c2a 100644
--- a/test/wpt/tests/interfaces/generic-sensor.idl
+++ b/test/wpt/tests/interfaces/generic-sensor.idl
@@ -28,33 +28,3 @@ interface SensorErrorEvent : Event {
 dictionary SensorErrorEventInit : EventInit {
   required DOMException error;
 };
-
-dictionary MockSensorConfiguration {
-  required MockSensorType mockSensorType;
-  boolean connected = true;
-  double? maxSamplingFrequency;
-  double? minSamplingFrequency;
-};
-
-dictionary MockSensor {
-  double maxSamplingFrequency;
-  double minSamplingFrequency;
-  double requestedSamplingFrequency;
-};
-
-enum MockSensorType {
-  "ambient-light",
-  "accelerometer",
-  "linear-acceleration",
-  "gravity",
-  "gyroscope",
-  "magnetometer",
-  "uncalibrated-magnetometer",
-  "absolute-orientation",
-  "relative-orientation",
-  "geolocation",
-  "proximity",
-};
-
-dictionary MockSensorReadingValues {
-};
diff --git a/test/wpt/tests/interfaces/geolocation-sensor.idl b/test/wpt/tests/interfaces/geolocation-sensor.idl
index e1d676205ff..89117af3753 100644
--- a/test/wpt/tests/interfaces/geolocation-sensor.idl
+++ b/test/wpt/tests/interfaces/geolocation-sensor.idl
@@ -35,13 +35,3 @@ dictionary GeolocationSensorReading {
   double? heading;
   double? speed;
 };
-
-dictionary GeolocationReadingValues {
-  required double? latitude;
-  required double? longitude;
-  required double? altitude;
-  required double? accuracy;
-  required double? altitudeAccuracy;
-  required double? heading;
-  required double? speed;
-};
diff --git a/test/wpt/tests/interfaces/gpc-spec.idl b/test/wpt/tests/interfaces/gpc-spec.idl
deleted file mode 100644
index 0e9a063c54c..00000000000
--- a/test/wpt/tests/interfaces/gpc-spec.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into webref
-// (https://github.com/w3c/webref)
-// Source: Global Privacy Control (GPC) (https://privacycg.github.io/gpc-spec/)
-
-interface mixin GlobalPrivacyControl {
-  readonly attribute boolean globalPrivacyControl;
-};
-Navigator includes GlobalPrivacyControl;
-WorkerNavigator includes GlobalPrivacyControl;
diff --git a/test/wpt/tests/interfaces/gyroscope.idl b/test/wpt/tests/interfaces/gyroscope.idl
index 00fb0efcace..fd80669bfc2 100644
--- a/test/wpt/tests/interfaces/gyroscope.idl
+++ b/test/wpt/tests/interfaces/gyroscope.idl
@@ -16,9 +16,3 @@ enum GyroscopeLocalCoordinateSystem { "device", "screen" };
 dictionary GyroscopeSensorOptions : SensorOptions {
   GyroscopeLocalCoordinateSystem referenceFrame = "device";
 };
-
-dictionary GyroscopeReadingValues {
-  required double? x;
-  required double? y;
-  required double? z;
-};
diff --git a/test/wpt/tests/interfaces/html.idl b/test/wpt/tests/interfaces/html.idl
index 99b33705b39..b7501feea91 100644
--- a/test/wpt/tests/interfaces/html.idl
+++ b/test/wpt/tests/interfaces/html.idl
@@ -48,6 +48,8 @@ typedef (HTMLScriptElement or SVGScriptElement) HTMLOrSVGScriptElement;
 
 [LegacyOverrideBuiltIns]
 partial interface Document {
+  static Document parseHTMLUnsafe(DOMString html);
+
   // resource metadata management
   [PutForwards=href, LegacyUnforgeable] readonly attribute Location? location;
   attribute USVString domain;
@@ -131,7 +133,7 @@ interface HTMLElement : Element {
   // The popover API
   undefined showPopover();
   undefined hidePopover();
-  undefined togglePopover(optional boolean force);
+  boolean togglePopover(optional boolean force);
   [CEReactions] attribute DOMString? popover;
 };
 
@@ -999,6 +1001,8 @@ interface HTMLSelectElement : HTMLElement {
   boolean reportValidity();
   undefined setCustomValidity(DOMString error);
 
+  undefined showPicker();
+
   readonly attribute NodeList labels;
 };
 
@@ -1196,6 +1200,7 @@ dictionary FormDataEventInit : EventInit {
 interface HTMLDetailsElement : HTMLElement {
   [HTMLConstructor] constructor();
 
+  [CEReactions] attribute DOMString name;
   [CEReactions] attribute boolean open;
 };
 
@@ -1236,6 +1241,8 @@ interface HTMLTemplateElement : HTMLElement {
   [HTMLConstructor] constructor();
 
   readonly attribute DocumentFragment content;
+  [CEReactions] attribute DOMString shadowRootMode;
+  [CEReactions] attribute boolean shadowRootDelegatesFocus;
 };
 
 [Exposed=Window]
@@ -1594,6 +1601,7 @@ OffscreenCanvasRenderingContext2D includes CanvasPath;
 interface CustomElementRegistry {
   [CEReactions] undefined define(DOMString name, CustomElementConstructor constructor, optional ElementDefinitionOptions options = {});
   (CustomElementConstructor or undefined) get(DOMString name);
+  DOMString? getName(CustomElementConstructor constructor);
   Promise<CustomElementConstructor> whenDefined(DOMString name);
   [CEReactions] undefined upgrade(Node root);
 };
@@ -1661,6 +1669,18 @@ partial interface Navigator {
   [SameObject] readonly attribute UserActivation userActivation;
 };
 
+[Exposed=Window]
+interface ToggleEvent : Event {
+  constructor(DOMString type, optional ToggleEventInit eventInitDict = {});
+  readonly attribute DOMString oldState;
+  readonly attribute DOMString newState;
+};
+
+dictionary ToggleEventInit : EventInit {
+  DOMString oldState = "";
+  DOMString newState = "";
+};
+
 dictionary FocusOptions {
   boolean preventScroll = false;
   boolean focusVisible;
@@ -1673,6 +1693,22 @@ interface mixin ElementContentEditable {
   [CEReactions] attribute DOMString inputMode;
 };
 
+[Exposed=Window]
+interface CloseWatcher : EventTarget {
+  constructor(optional CloseWatcherOptions options = {});
+
+  undefined requestClose();
+  undefined close();
+  undefined destroy();
+
+  attribute EventHandler oncancel;
+  attribute EventHandler onclose;
+};
+
+dictionary CloseWatcherOptions {
+  AbortSignal signal;
+};
+
 [Exposed=Window]
 interface DataTransfer {
   constructor();
@@ -1728,18 +1764,6 @@ interface mixin PopoverInvokerElement {
   [CEReactions] attribute DOMString popoverTargetAction;
 };
 
-[Exposed=Window]
-interface ToggleEvent : Event {
-  constructor(DOMString type, optional ToggleEventInit eventInitDict = {});
-  readonly attribute DOMString oldState;
-  readonly attribute DOMString newState;
-};
-
-dictionary ToggleEventInit : EventInit {
-  DOMString oldState = "";
-  DOMString newState = "";
-};
-
 [Global=Window,
  Exposed=Window,
  LegacyUnenumerableNamedProperties]
@@ -1751,6 +1775,7 @@ interface Window : EventTarget {
   attribute DOMString name;
   [PutForwards=href, LegacyUnforgeable] readonly attribute Location location;
   readonly attribute History history;
+  readonly attribute Navigation navigation;
   readonly attribute CustomElementRegistry customElements;
   [Replaceable] readonly attribute BarProp locationbar;
   [Replaceable] readonly attribute BarProp menubar;
@@ -1781,7 +1806,7 @@ interface Window : EventTarget {
 
   // the user agent
   readonly attribute Navigator navigator;
-  readonly attribute Navigator clientInformation; // legacy alias of .navigator
+  [Replaceable] readonly attribute Navigator clientInformation; // legacy alias of .navigator
   readonly attribute boolean originAgentCluster;
 
   // user prompts
@@ -1841,15 +1866,169 @@ interface History {
   undefined replaceState(any data, DOMString unused, optional USVString? url = null);
 };
 
+[Exposed=Window]
+interface Navigation : EventTarget {
+  sequence<NavigationHistoryEntry> entries();
+  readonly attribute NavigationHistoryEntry? currentEntry;
+  undefined updateCurrentEntry(NavigationUpdateCurrentEntryOptions options);
+  readonly attribute NavigationTransition? transition;
+
+  readonly attribute boolean canGoBack;
+  readonly attribute boolean canGoForward;
+
+  NavigationResult navigate(USVString url, optional NavigationNavigateOptions options = {});
+  NavigationResult reload(optional NavigationReloadOptions options = {});
+
+  NavigationResult traverseTo(DOMString key, optional NavigationOptions options = {});
+  NavigationResult back(optional NavigationOptions options = {});
+  NavigationResult forward(optional NavigationOptions options = {});
+
+  attribute EventHandler onnavigate;
+  attribute EventHandler onnavigatesuccess;
+  attribute EventHandler onnavigateerror;
+  attribute EventHandler oncurrententrychange;
+};
+
+dictionary NavigationUpdateCurrentEntryOptions {
+  required any state;
+};
+
+dictionary NavigationOptions {
+  any info;
+};
+
+dictionary NavigationNavigateOptions : NavigationOptions {
+  any state;
+  NavigationHistoryBehavior history = "auto";
+};
+
+dictionary NavigationReloadOptions : NavigationOptions {
+  any state;
+};
+
+dictionary NavigationResult {
+  Promise<NavigationHistoryEntry> committed;
+  Promise<NavigationHistoryEntry> finished;
+};
+
+enum NavigationHistoryBehavior {
+  "auto",
+  "push",
+  "replace"
+};
+
+enum NavigationType {
+ "push",
+ "replace",
+ "reload",
+ "traverse"
+};
+
+[Exposed=Window]
+interface NavigationHistoryEntry : EventTarget {
+  readonly attribute USVString? url;
+  readonly attribute DOMString key;
+  readonly attribute DOMString id;
+  readonly attribute long long index;
+  readonly attribute boolean sameDocument;
+
+  any getState();
+
+  attribute EventHandler ondispose;
+};
+
+[Exposed=Window]
+interface NavigationTransition {
+  readonly attribute NavigationType navigationType;
+  readonly attribute NavigationHistoryEntry from;
+  readonly attribute Promise<undefined> finished;
+};
+
+[Exposed=Window]
+interface NavigateEvent : Event {
+  constructor(DOMString type, NavigateEventInit eventInitDict);
+
+  readonly attribute NavigationType navigationType;
+  readonly attribute NavigationDestination destination;
+  readonly attribute boolean canIntercept;
+  readonly attribute boolean userInitiated;
+  readonly attribute boolean hashChange;
+  readonly attribute AbortSignal signal;
+  readonly attribute FormData? formData;
+  readonly attribute DOMString? downloadRequest;
+  readonly attribute any info;
+  readonly attribute boolean hasUAVisualTransition;
+
+  undefined intercept(optional NavigationInterceptOptions options = {});
+  undefined scroll();
+};
+
+dictionary NavigateEventInit : EventInit {
+  NavigationType navigationType = "push";
+  required NavigationDestination destination;
+  boolean canIntercept = false;
+  boolean userInitiated = false;
+  boolean hashChange = false;
+  required AbortSignal signal;
+  FormData? formData = null;
+  DOMString? downloadRequest = null;
+  any info;
+  boolean hasUAVisualTransition = false;
+};
+
+dictionary NavigationInterceptOptions {
+  NavigationInterceptHandler handler;
+  NavigationFocusReset focusReset;
+  NavigationScrollBehavior scroll;
+};
+
+enum NavigationFocusReset {
+  "after-transition",
+  "manual"
+};
+
+enum NavigationScrollBehavior {
+  "after-transition",
+  "manual"
+};
+
+callback NavigationInterceptHandler = Promise<undefined> ();
+
+[Exposed=Window]
+interface NavigationDestination {
+  readonly attribute USVString url;
+  readonly attribute DOMString key;
+  readonly attribute DOMString id;
+  readonly attribute long long index;
+  readonly attribute boolean sameDocument;
+
+  any getState();
+};
+
+[Exposed=Window]
+interface NavigationCurrentEntryChangeEvent : Event {
+  constructor(DOMString type, NavigationCurrentEntryChangeEventInit eventInitDict);
+
+  readonly attribute NavigationType? navigationType;
+  readonly attribute NavigationHistoryEntry from;
+};
+
+dictionary NavigationCurrentEntryChangeEventInit : EventInit {
+  NavigationType? navigationType = null;
+  required NavigationHistoryEntry from;
+};
+
 [Exposed=Window]
 interface PopStateEvent : Event {
   constructor(DOMString type, optional PopStateEventInit eventInitDict = {});
 
   readonly attribute any state;
+  readonly attribute boolean hasUAVisualTransition;
 };
 
 dictionary PopStateEventInit : EventInit {
   any state = null;
+  boolean hasUAVisualTransition = false;
 };
 
 [Exposed=Window]
@@ -2069,6 +2248,14 @@ enum DOMParserSupportedType {
   "image/svg+xml"
 };
 
+partial interface Element {
+  undefined setHTMLUnsafe(DOMString html);
+};
+
+partial interface ShadowRoot {
+  undefined setHTMLUnsafe(DOMString html);
+};
+
 [Exposed=Window]
 interface Navigator {
   // objects implementing this interface also implement the interfaces given below
diff --git a/test/wpt/tests/interfaces/image-capture.idl b/test/wpt/tests/interfaces/image-capture.idl
index f98912cb6a1..21e03d4db82 100644
--- a/test/wpt/tests/interfaces/image-capture.idl
+++ b/test/wpt/tests/interfaces/image-capture.idl
@@ -89,7 +89,7 @@ partial dictionary MediaTrackCapabilities {
   MediaSettingsRange   tilt;
   MediaSettingsRange   zoom;
 
-  boolean              torch;
+  sequence<boolean> torch;
 };
 
 partial dictionary MediaTrackConstraintSet {
diff --git a/test/wpt/tests/interfaces/intersection-observer.idl b/test/wpt/tests/interfaces/intersection-observer.idl
index 52db1c4baa9..8502a11357f 100644
--- a/test/wpt/tests/interfaces/intersection-observer.idl
+++ b/test/wpt/tests/interfaces/intersection-observer.idl
@@ -10,6 +10,7 @@ interface IntersectionObserver {
   constructor(IntersectionObserverCallback callback, optional IntersectionObserverInit options = {});
   readonly attribute (Element or Document)? root;
   readonly attribute DOMString rootMargin;
+  readonly attribute DOMString scrollMargin;
   readonly attribute FrozenArray<double> thresholds;
   undefined observe(Element target);
   undefined unobserve(Element target);
@@ -42,5 +43,6 @@ dictionary IntersectionObserverEntryInit {
 dictionary IntersectionObserverInit {
   (Element or Document)?  root = null;
   DOMString rootMargin = "0px";
+  DOMString scrollMargin = "0px";
   (double or sequence<double>) threshold = 0;
 };
diff --git a/test/wpt/tests/interfaces/invokers.tentative.idl b/test/wpt/tests/interfaces/invokers.tentative.idl
new file mode 100644
index 00000000000..62f7398b827
--- /dev/null
+++ b/test/wpt/tests/interfaces/invokers.tentative.idl
@@ -0,0 +1,15 @@
+interface mixin InvokerElement {
+  [CEReactions,Reflect=invoketarget] attribute Element? invokeTargetElement;
+  [CEReactions,Reflect,ReflectMissing="auto",ReflectEmpty="auto"] attribute DOMString invokeAction;
+};
+
+interface InvokeEvent : Event {
+    constructor(DOMString type, optional InvokeEventInit eventInitDict = {});
+    readonly attribute Element? invoker;
+    readonly attribute DOMString action;
+};
+
+dictionary InvokeEventInit : EventInit {
+    Element? invoker = null;
+    DOMString action = "auto";
+};
diff --git a/test/wpt/tests/interfaces/longtasks.idl b/test/wpt/tests/interfaces/longtasks.idl
index c0aaa7a2979..064d1072d2d 100644
--- a/test/wpt/tests/interfaces/longtasks.idl
+++ b/test/wpt/tests/interfaces/longtasks.idl
@@ -17,3 +17,12 @@ interface TaskAttributionTiming : PerformanceEntry {
     readonly attribute DOMString containerName;
     [Default] object toJSON();
 };
+
+[Exposed=Window]
+interface PerformanceLongAnimationFrameTiming : PerformanceEntry {
+    readonly attribute DOMHighResTimeStamp renderStart;
+    readonly attribute DOMHighResTimeStamp styleAndLayoutStart;
+    readonly attribute DOMHighResTimeStamp blockingDuration;
+
+    [Default] object toJSON();
+};
diff --git a/test/wpt/tests/interfaces/magnetometer.idl b/test/wpt/tests/interfaces/magnetometer.idl
index 45ba9edcfe5..ded7e3cba82 100644
--- a/test/wpt/tests/interfaces/magnetometer.idl
+++ b/test/wpt/tests/interfaces/magnetometer.idl
@@ -29,18 +29,3 @@ interface UncalibratedMagnetometer : Sensor {
   readonly attribute double? yBias;
   readonly attribute double? zBias;
 };
-
-dictionary MagnetometerReadingValues {
-  required double? x;
-  required double? y;
-  required double? z;
-};
-
-dictionary UncalibratedMagnetometerReadingValues {
-  required double? x;
-  required double? y;
-  required double? z;
-  required double? xBias;
-  required double? yBias;
-  required double? zBias;
-};
diff --git a/test/wpt/tests/interfaces/managed-configuration.idl b/test/wpt/tests/interfaces/managed-configuration.idl
new file mode 100644
index 00000000000..c04bf787cdc
--- /dev/null
+++ b/test/wpt/tests/interfaces/managed-configuration.idl
@@ -0,0 +1,20 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Managed Configuration API (https://wicg.github.io/WebApiDevice/managed_config/)
+
+[
+  SecureContext
+] partial interface Navigator {
+  [SecureContext, SameObject]
+  readonly attribute NavigatorManagedData managed;
+};
+
+[
+  SecureContext,
+  Exposed=Window
+] interface NavigatorManagedData : EventTarget {
+  // Managed Configuration API.
+  Promise<record<DOMString, object>> getManagedConfiguration(sequence<DOMString> keys);
+  attribute EventHandler onmanagedconfigurationchange;
+};
diff --git a/test/wpt/tests/interfaces/media-source.idl b/test/wpt/tests/interfaces/media-source.idl
index 11059437f62..adaac2ca9b2 100644
--- a/test/wpt/tests/interfaces/media-source.idl
+++ b/test/wpt/tests/interfaces/media-source.idl
@@ -4,14 +4,14 @@
 // Source: Media Source Extensions™ (https://w3c.github.io/media-source/)
 
 enum ReadyState {
-    "closed",
-    "open",
-    "ended"
+  "closed",
+  "open",
+  "ended",
 };
 
 enum EndOfStreamError {
-    "network",
-    "decode"
+  "network",
+  "decode",
 };
 
 [Exposed=(Window,DedicatedWorker)]
@@ -41,8 +41,8 @@ interface MediaSource : EventTarget {
 interface MediaSourceHandle {};
 
 enum AppendMode {
-    "segments",
-    "sequence"
+  "segments",
+  "sequence",
 };
 
 [Exposed=(Window,DedicatedWorker)]
diff --git a/test/wpt/tests/interfaces/mediacapture-streams.idl b/test/wpt/tests/interfaces/mediacapture-streams.idl
index 3197ff73689..373f0c328d9 100644
--- a/test/wpt/tests/interfaces/mediacapture-streams.idl
+++ b/test/wpt/tests/interfaces/mediacapture-streams.idl
@@ -239,10 +239,6 @@ typedef (DOMString or
 sequence<DOMString> or
 ConstrainDOMStringParameters) ConstrainDOMString;
 
-dictionary DevicePermissionDescriptor : PermissionDescriptor {
-  DOMString deviceId;
-};
-
-dictionary CameraDevicePermissionDescriptor : DevicePermissionDescriptor {
+dictionary CameraDevicePermissionDescriptor : PermissionDescriptor {
   boolean panTiltZoom = false;
 };
diff --git a/test/wpt/tests/interfaces/mediasession.idl b/test/wpt/tests/interfaces/mediasession.idl
index cca46ac5a85..2cca3674a5e 100644
--- a/test/wpt/tests/interfaces/mediasession.idl
+++ b/test/wpt/tests/interfaces/mediasession.idl
@@ -1,7 +1,7 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into webref
 // (https://github.com/w3c/webref)
-// Source: Media Session Standard (https://w3c.github.io/mediasession/)
+// Source: Media Session (https://w3c.github.io/mediasession/)
 
 [Exposed=Window]
 partial interface Navigator {
@@ -28,7 +28,8 @@ enum MediaSessionAction {
   "togglecamera",
   "hangup",
   "previousslide",
-  "nextslide"
+  "nextslide",
+  "enterpictureinpicture"
 };
 
 callback MediaSessionActionHandler = undefined(MediaSessionActionDetails details);
diff --git a/test/wpt/tests/interfaces/navigation-timing.idl b/test/wpt/tests/interfaces/navigation-timing.idl
index 5a33964f07e..355950160e3 100644
--- a/test/wpt/tests/interfaces/navigation-timing.idl
+++ b/test/wpt/tests/interfaces/navigation-timing.idl
@@ -15,6 +15,7 @@ interface PerformanceNavigationTiming : PerformanceResourceTiming {
     readonly        attribute DOMHighResTimeStamp  loadEventEnd;
     readonly        attribute NavigationTimingType type;
     readonly        attribute unsigned short       redirectCount;
+    readonly        attribute DOMHighResTimeStamp  criticalCHRestart;
     [Default] object toJSON();
 };
 
diff --git a/test/wpt/tests/interfaces/orientation-event.idl b/test/wpt/tests/interfaces/orientation-event.idl
index a93d4658830..965e833fd21 100644
--- a/test/wpt/tests/interfaces/orientation-event.idl
+++ b/test/wpt/tests/interfaces/orientation-event.idl
@@ -29,10 +29,6 @@ partial interface Window {
     [SecureContext] attribute EventHandler ondeviceorientationabsolute;
 };
 
-partial interface Window {
-    [SecureContext] attribute EventHandler ondevicemotion;
-};
-
 [Exposed=Window, SecureContext]
 interface DeviceMotionEventAcceleration {
     readonly attribute double? x;
@@ -47,6 +43,10 @@ interface DeviceMotionEventRotationRate {
     readonly attribute double? gamma;
 };
 
+partial interface Window {
+    [SecureContext] attribute EventHandler ondevicemotion;
+};
+
 [Exposed=Window, SecureContext]
 interface DeviceMotionEvent : Event {
     constructor(DOMString type, optional DeviceMotionEventInit eventInitDict = {});
diff --git a/test/wpt/tests/interfaces/orientation-sensor.idl b/test/wpt/tests/interfaces/orientation-sensor.idl
index 5172c87cd4e..6b258642c3b 100644
--- a/test/wpt/tests/interfaces/orientation-sensor.idl
+++ b/test/wpt/tests/interfaces/orientation-sensor.idl
@@ -26,10 +26,3 @@ interface AbsoluteOrientationSensor : OrientationSensor {
 interface RelativeOrientationSensor : OrientationSensor {
   constructor(optional OrientationSensorOptions sensorOptions = {});
 };
-
-dictionary AbsoluteOrientationReadingValues {
-  required FrozenArray<double>? quaternion;
-};
-
-dictionary RelativeOrientationReadingValues : AbsoluteOrientationReadingValues {
-};
diff --git a/test/wpt/tests/interfaces/performance-timeline.idl b/test/wpt/tests/interfaces/performance-timeline.idl
index cdd8fafd8c6..6ef84b6cbb8 100644
--- a/test/wpt/tests/interfaces/performance-timeline.idl
+++ b/test/wpt/tests/interfaces/performance-timeline.idl
@@ -12,10 +12,12 @@ typedef sequence<PerformanceEntry> PerformanceEntryList;
 
 [Exposed=(Window,Worker)]
 interface PerformanceEntry {
+  readonly    attribute unsigned long long  id;
   readonly    attribute DOMString           name;
   readonly    attribute DOMString           entryType;
   readonly    attribute DOMHighResTimeStamp startTime;
   readonly    attribute DOMHighResTimeStamp duration;
+  readonly    attribute unsigned long long  navigationId;
   [Default] object toJSON();
 };
 
diff --git a/test/wpt/tests/interfaces/private-network-access.idl b/test/wpt/tests/interfaces/private-network-access.idl
new file mode 100644
index 00000000000..65b58760228
--- /dev/null
+++ b/test/wpt/tests/interfaces/private-network-access.idl
@@ -0,0 +1,19 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Private Network Access (https://wicg.github.io/private-network-access/)
+
+enum IPAddressSpace { "public", "private", "local" };
+
+dictionary PrivateNetworkAccessPermissionDescriptor
+    : PermissionDescriptor {
+  DOMString id;
+};
+
+partial dictionary RequestInit {
+  IPAddressSpace targetAddressSpace;
+};
+
+partial interface Request {
+  readonly attribute IPAddressSpace targetAddressSpace;
+};
diff --git a/test/wpt/tests/interfaces/proximity.idl b/test/wpt/tests/interfaces/proximity.idl
index 3cbfbd5ad13..67513adb141 100644
--- a/test/wpt/tests/interfaces/proximity.idl
+++ b/test/wpt/tests/interfaces/proximity.idl
@@ -10,9 +10,3 @@ interface ProximitySensor : Sensor {
   readonly attribute double? max;
   readonly attribute boolean? near;
 };
-
-dictionary ProximityReadingValues {
-  required double? distance;
-  required double? max;
-  required boolean? near;
-};
diff --git a/test/wpt/tests/interfaces/real-world-meshing.idl b/test/wpt/tests/interfaces/real-world-meshing.idl
index 38fe71f6c66..e3c2970fa59 100644
--- a/test/wpt/tests/interfaces/real-world-meshing.idl
+++ b/test/wpt/tests/interfaces/real-world-meshing.idl
@@ -17,5 +17,5 @@
 };
 
 partial interface XRFrame {
-  readonly attribute XRMeshSet detectedMeshs;
+  readonly attribute XRMeshSet detectedMeshes;
 };
diff --git a/test/wpt/tests/interfaces/screen-capture.idl b/test/wpt/tests/interfaces/screen-capture.idl
index 830b96d16fa..45fd0dd72c5 100644
--- a/test/wpt/tests/interfaces/screen-capture.idl
+++ b/test/wpt/tests/interfaces/screen-capture.idl
@@ -8,6 +8,7 @@ partial interface MediaDevices {
 };
 
 enum CaptureStartFocusBehavior {
+  "focus-capturing-application",
   "focus-captured-surface",
   "no-focus-change"
 };
@@ -33,6 +34,11 @@ enum SurfaceSwitchingPreferenceEnum {
   "exclude"
 };
 
+enum MonitorTypeSurfacesEnum {
+  "include",
+  "exclude"
+};
+
 dictionary DisplayMediaStreamOptions {
   (boolean or MediaTrackConstraints) video = true;
   (boolean or MediaTrackConstraints) audio = false;
@@ -40,6 +46,7 @@ dictionary DisplayMediaStreamOptions {
   SelfCapturePreferenceEnum selfBrowserSurface;
   SystemAudioPreferenceEnum systemAudio;
   SurfaceSwitchingPreferenceEnum surfaceSwitching;
+  MonitorTypeSurfacesEnum monitorTypeSurfaces;
 };
 
 partial dictionary MediaTrackSupportedConstraints {
diff --git a/test/wpt/tests/interfaces/scroll-animations.idl b/test/wpt/tests/interfaces/scroll-animations.idl
index 31b3746e9d4..d18b8f110d2 100644
--- a/test/wpt/tests/interfaces/scroll-animations.idl
+++ b/test/wpt/tests/interfaces/scroll-animations.idl
@@ -6,8 +6,8 @@
 enum ScrollAxis {
   "block",
   "inline",
-  "horizontal",
-  "vertical"
+  "x",
+  "y"
 };
 
 dictionary ScrollTimelineOptions {
@@ -35,12 +35,3 @@ interface ViewTimeline : ScrollTimeline {
   readonly attribute CSSNumericValue startOffset;
   readonly attribute CSSNumericValue endOffset;
 };
-
-dictionary AnimationTimeOptions {
-  DOMString? range;
-};
-
-[Exposed=Window]
-partial interface AnimationTimeline {
-  CSSNumericValue? getCurrentTime(optional AnimationTimeOptions options = {});
-};
diff --git a/test/wpt/tests/interfaces/secure-payment-confirmation.idl b/test/wpt/tests/interfaces/secure-payment-confirmation.idl
index 08ec8065c53..bec599d7a23 100644
--- a/test/wpt/tests/interfaces/secure-payment-confirmation.idl
+++ b/test/wpt/tests/interfaces/secure-payment-confirmation.idl
@@ -16,6 +16,10 @@ dictionary SecurePaymentConfirmationRequest {
     boolean showOptOut;
 };
 
+partial interface PaymentRequest {
+    static Promise<boolean> isSecurePaymentConfirmationAvailable();
+};
+
 partial dictionary AuthenticationExtensionsClientInputs {
   AuthenticationExtensionsPaymentInputs payment;
 };
diff --git a/test/wpt/tests/interfaces/serial.idl b/test/wpt/tests/interfaces/serial.idl
index ee46a8562bb..e624c3c1a60 100644
--- a/test/wpt/tests/interfaces/serial.idl
+++ b/test/wpt/tests/interfaces/serial.idl
@@ -23,11 +23,13 @@ interface Serial : EventTarget {
 
 dictionary SerialPortRequestOptions {
   sequence<SerialPortFilter> filters;
+  sequence<BluetoothServiceUUID> allowedBluetoothServiceClassIds;
 };
 
 dictionary SerialPortFilter {
   unsigned short usbVendorId;
   unsigned short usbProductId;
+  BluetoothServiceUUID bluetoothServiceClassId;
 };
 
 [Exposed=(DedicatedWorker,Window), SecureContext]
@@ -49,6 +51,7 @@ interface SerialPort : EventTarget {
 dictionary SerialPortInfo {
   unsigned short usbVendorId;
   unsigned short usbProductId;
+  BluetoothServiceUUID bluetoothServiceClassId;
 };
 
 dictionary SerialOptions {
diff --git a/test/wpt/tests/interfaces/shared-storage.idl b/test/wpt/tests/interfaces/shared-storage.idl
index eb5806f9a6d..edbe2c2bcc3 100644
--- a/test/wpt/tests/interfaces/shared-storage.idl
+++ b/test/wpt/tests/interfaces/shared-storage.idl
@@ -11,6 +11,8 @@ interface SharedStorageWorklet : Worklet {
 interface SharedStorageWorkletGlobalScope : WorkletGlobalScope {
   undefined register(DOMString name,
                      SharedStorageOperationConstructor operationCtor);
+
+  readonly attribute WorkletSharedStorage sharedStorage;
 };
 
 callback SharedStorageOperationConstructor =
@@ -70,6 +72,10 @@ dictionary SharedStorageUrlWithMetadata {
   object reportingMetadata;
 };
 
+partial interface Window {
+  [SecureContext] readonly attribute WindowSharedStorage? sharedStorage;
+};
+
 [Exposed=(SharedStorageWorklet)]
 interface WorkletSharedStorage : SharedStorage {
   Promise<DOMString> get(DOMString key);
@@ -78,3 +84,14 @@ interface WorkletSharedStorage : SharedStorage {
 
   async iterable<DOMString, DOMString>;
 };
+
+interface mixin HTMLSharedStorageWritableElementUtils {
+  [CEReactions, SecureContext] attribute boolean sharedStorageWritable;
+};
+
+HTMLIFrameElement includes HTMLSharedStorageWritableElementUtils;
+HTMLImageElement includes HTMLSharedStorageWritableElementUtils;
+
+partial dictionary RequestInit {
+  boolean sharedStorageWritable;
+};
diff --git a/test/wpt/tests/interfaces/storage-buckets.idl b/test/wpt/tests/interfaces/storage-buckets.idl
index f3d500a5711..79f6c947d16 100644
--- a/test/wpt/tests/interfaces/storage-buckets.idl
+++ b/test/wpt/tests/interfaces/storage-buckets.idl
@@ -18,16 +18,10 @@ interface StorageBucketManager {
     Promise<undefined> delete(DOMString name);
 };
 
-enum StorageBucketDurability {
-  "strict",
-  "relaxed"
-};
-
 dictionary StorageBucketOptions {
-  boolean? persisted = null;
-  StorageBucketDurability? durability = null;
-  unsigned long long? quota = null;
-  DOMHighResTimeStamp? expires = null;
+  boolean persisted = false;
+  unsigned long long? quota;
+  DOMHighResTimeStamp? expires;
 };
 
 [Exposed=(Window,Worker),
@@ -40,8 +34,6 @@ interface StorageBucket {
 
   Promise<StorageEstimate> estimate();
 
-  Promise<StorageBucketDurability> durability();
-
   Promise<undefined> setExpires(DOMHighResTimeStamp expires);
   Promise<DOMHighResTimeStamp?> expires();
 
diff --git a/test/wpt/tests/interfaces/storage-buckets.tentative.idl b/test/wpt/tests/interfaces/storage-buckets.tentative.idl
deleted file mode 100644
index 73d72ceab98..00000000000
--- a/test/wpt/tests/interfaces/storage-buckets.tentative.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-[
-  Exposed=(Window,Worker),
-  SecureContext
-] interface StorageBucketManager {
-    Promise<StorageBucket> open(DOMString name,
-                                optional StorageBucketOptions options = {});
-    Promise<sequence<DOMString>> keys();
-    Promise<undefined> delete(DOMString name);
-};
-
-dictionary StorageBucketOptions {
-  boolean persisted = false;
-  StorageBucketDurability durability = "relaxed";
-  unsigned long long? quota = null;
-  DOMTimeStamp? expires = null;
-};
-
-enum StorageBucketDurability {
-  "strict",
-  "relaxed"
-};
-
-[
-  Exposed=(Window,Worker),
-  SecureContext
-] interface StorageBucket {
-  [Exposed=Window] Promise<boolean> persist();
-  Promise<boolean> persisted();
-
-  Promise<StorageEstimate> estimate();
-
-  Promise<StorageBucketDurability> durability();
-
-  Promise<undefined> setExpires(DOMTimeStamp expires);
-  Promise<DOMTimeStamp> expires();
-};
diff --git a/test/wpt/tests/interfaces/streams.idl b/test/wpt/tests/interfaces/streams.idl
index fd5420f16a0..ab9be033e43 100644
--- a/test/wpt/tests/interfaces/streams.idl
+++ b/test/wpt/tests/interfaces/streams.idl
@@ -7,6 +7,8 @@
 interface ReadableStream {
   constructor(optional object underlyingSource, optional QueuingStrategy strategy = {});
 
+  static ReadableStream from(any asyncIterable);
+
   readonly attribute boolean locked;
 
   Promise<undefined> cancel(optional any reason);
@@ -82,11 +84,15 @@ dictionary ReadableStreamReadResult {
 interface ReadableStreamBYOBReader {
   constructor(ReadableStream stream);
 
-  Promise<ReadableStreamReadResult> read(ArrayBufferView view);
+  Promise<ReadableStreamReadResult> read(ArrayBufferView view, optional ReadableStreamBYOBReaderReadOptions options = {});
   undefined releaseLock();
 };
 ReadableStreamBYOBReader includes ReadableStreamGenericReader;
 
+dictionary ReadableStreamBYOBReaderReadOptions {
+  [EnforceRange] unsigned long long min = 1;
+};
+
 [Exposed=*]
 interface ReadableStreamDefaultController {
   readonly attribute unrestricted double? desiredSize;
@@ -172,6 +178,7 @@ dictionary Transformer {
   TransformerStartCallback start;
   TransformerTransformCallback transform;
   TransformerFlushCallback flush;
+  TransformerCancelCallback cancel;
   any readableType;
   any writableType;
 };
@@ -179,6 +186,7 @@ dictionary Transformer {
 callback TransformerStartCallback = any (TransformStreamDefaultController controller);
 callback TransformerFlushCallback = Promise<undefined> (TransformStreamDefaultController controller);
 callback TransformerTransformCallback = Promise<undefined> (any chunk, TransformStreamDefaultController controller);
+callback TransformerCancelCallback = Promise<undefined> (any reason);
 
 [Exposed=*]
 interface TransformStreamDefaultController {
diff --git a/test/wpt/tests/interfaces/sub-apps.tentative.idl b/test/wpt/tests/interfaces/sub-apps.tentative.idl
deleted file mode 100644
index 39dcd97a500..00000000000
--- a/test/wpt/tests/interfaces/sub-apps.tentative.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  Exposed=Window,
-  SecureContext,
-  ImplementedAs=SubApps
-] partial interface Navigator {
-  [SameObject, RuntimeEnabled=DesktopPWAsSubApps] readonly attribute SubApps subApps;
-};
-
-[
-  Exposed=Window,
-  SecureContext,
-  RuntimeEnabled=DesktopPWAsSubApps
-] interface SubApps {
-  [CallWith=ScriptState, RaisesException] Promise<undefined> add(DOMString install_url);
-  [CallWith=ScriptState, RaisesException] Promise<FrozenArray<DOMString>> list();
-  [CallWith=ScriptState, RaisesException] Promise<undefined> remove(DOMString app_id);
-};
diff --git a/test/wpt/tests/interfaces/trust-token-api.idl b/test/wpt/tests/interfaces/trust-token-api.idl
index f521acea1f5..fb7f15b4b74 100644
--- a/test/wpt/tests/interfaces/trust-token-api.idl
+++ b/test/wpt/tests/interfaces/trust-token-api.idl
@@ -20,6 +20,14 @@ partial dictionary RequestInit {
   PrivateToken privateToken;
 };
 
+partial interface HTMLIFrameElement {
+  [SecureContext] attribute DOMString privateToken;
+};
+
+partial interface XMLHttpRequest {
+  undefined setPrivateToken(PrivateToken privateToken);
+};
+
 partial interface Document {
   Promise<boolean> hasPrivateTokens(USVString issuer);
   Promise<boolean> hasRedemptionRecord(USVString issuer);
diff --git a/test/wpt/tests/interfaces/turtledove.idl b/test/wpt/tests/interfaces/turtledove.idl
index f5867e995a8..4700a98038c 100644
--- a/test/wpt/tests/interfaces/turtledove.idl
+++ b/test/wpt/tests/interfaces/turtledove.idl
@@ -5,22 +5,25 @@
 
 [SecureContext]
 partial interface Navigator {
-  Promise<undefined> joinAdInterestGroup(AuctionAdInterestGroup group, double durationSeconds);
+  Promise<undefined> joinAdInterestGroup(AuctionAdInterestGroup group);
 };
 
 dictionary AuctionAd {
   required USVString renderURL;
   any metadata;
+
+  USVString buyerReportingId;
+  USVString buyerAndSellerReportingId;
+  sequence<USVString> allowedReportingOrigins;
 };
 
-dictionary AuctionAdInterestGroup {
+dictionary GenerateBidInterestGroup {
   required USVString owner;
   required USVString name;
+  required double lifetimeMs;
 
-  double priority = 0.0;
   boolean enableBiddingSignalsPrioritization = false;
   record<DOMString, double> priorityVector;
-  record<DOMString, double> prioritySignalsOverrides;
 
   DOMString executionMode = "compatibility";
   USVString biddingLogicURL;
@@ -33,9 +36,15 @@ dictionary AuctionAdInterestGroup {
   sequence<AuctionAd> adComponents;
 };
 
+dictionary AuctionAdInterestGroup : GenerateBidInterestGroup {
+  double priority = 0.0;
+  record<DOMString, double> prioritySignalsOverrides;
+  DOMString additionalBidKey;
+};
+
 [SecureContext]
 partial interface Navigator {
-  Promise<undefined> leaveAdInterestGroup(AuctionAdInterestGroupKey group);
+  Promise<undefined> leaveAdInterestGroup(optional AuctionAdInterestGroupKey group = {});
 };
 
 dictionary AuctionAdInterestGroupKey {
@@ -45,7 +54,13 @@ dictionary AuctionAdInterestGroupKey {
 
 [SecureContext]
 partial interface Navigator {
-  Promise<USVString?> runAdAuction(AuctionAdConfig config);
+  Promise<undefined> clearOriginJoinedAdInterestGroups(
+      USVString owner, optional sequence<USVString> interestGroupsToKeep = []);
+};
+
+[SecureContext]
+partial interface Navigator {
+  Promise<(USVString or FencedFrameConfig)?> runAdAuction(AuctionAdConfig config);
 };
 
 dictionary AuctionAdConfig {
@@ -53,18 +68,29 @@ dictionary AuctionAdConfig {
   required USVString decisionLogicURL;
   USVString trustedScoringSignalsURL;
   sequence<USVString> interestGroupBuyers;
-  any auctionSignals;
-  any sellerSignals;
-  USVString directFromSellerSignals;
+  Promise<any> auctionSignals;
+  Promise<any> sellerSignals;
+  Promise<DOMString> directFromSellerSignalsHeaderAdSlot;
   unsigned long long sellerTimeout;
   unsigned short sellerExperimentGroupId;
-  record<USVString, any> perBuyerSignals;
-  record<USVString, unsigned long long> perBuyerTimeouts;
+  USVString sellerCurrency;
+  Promise<record<USVString, any>> perBuyerSignals;
+  Promise<record<USVString, unsigned long long>> perBuyerTimeouts;
+  Promise<record<USVString, unsigned long long>> perBuyerCumulativeTimeouts;
   record<USVString, unsigned short> perBuyerGroupLimits;
   record<USVString, unsigned short> perBuyerExperimentGroupIds;
   record<USVString, record<USVString, double>> perBuyerPrioritySignals;
+  Promise<record<USVString, USVString>> perBuyerCurrencies;
   sequence<AuctionAdConfig> componentAuctions = [];
+  Promise<undefined> additionalBids;
+  DOMString auctionNonce;
   AbortSignal? signal;
+  Promise<boolean> resolveToConfig;
+};
+
+[SecureContext]
+partial interface Navigator {
+  Promise<DOMString> createAuctionNonce();
 };
 
 [Exposed=InterestGroupScriptRunnerGlobalScope]
@@ -76,10 +102,26 @@ interface InterestGroupScriptRunnerGlobalScope {
          InterestGroupBiddingScriptRunnerGlobalScope)]
 interface InterestGroupBiddingScriptRunnerGlobalScope
         : InterestGroupScriptRunnerGlobalScope {
-  boolean setBid();
-  boolean setBid(GenerateBidOutput generateBidOutput);
+  boolean setBid(optional GenerateBidOutput generateBidOutput = {});
   undefined setPriority(double priority);
-  undefined setPrioritySignalsOverride(DOMString key, double priority);
+  undefined setPrioritySignalsOverride(DOMString key, optional double? priority);
+};
+
+dictionary AdRender {
+  required DOMString url;
+  DOMString width;
+  DOMString height;
+};
+
+dictionary GenerateBidOutput {
+  double bid = -1;
+  DOMString bidCurrency;
+  (DOMString or AdRender) render;
+  any ad;
+  sequence<(DOMString or AdRender)> adComponents;
+  double adCost;
+  unrestricted double modelingSignals;
+  boolean allowComponentAuction = false;
 };
 
 [Exposed=InterestGroupScoringScriptRunnerGlobalScope,
@@ -96,25 +138,97 @@ interface InterestGroupReportingScriptRunnerGlobalScope
         : InterestGroupScriptRunnerGlobalScope {
   undefined sendReportTo(DOMString url);
   undefined registerAdBeacon(record<DOMString, USVString> map);
+  undefined registerAdMacro(DOMString name, USVString value);
 };
 
-dictionary AdRender {
-  required DOMString url;
-  required DOMString width;
-  required DOMString height;
+[SecureContext]
+partial interface Navigator {
+  undefined updateAdInterestGroups();
 };
 
-dictionary GenerateBidOutput {
+partial dictionary RequestInit {
+  boolean adAuctionHeaders;
+};
+
+dictionary PreviousWin {
+  required long long timeDelta;
+  required DOMString adJSON;
+};
+
+dictionary BiddingBrowserSignals {
+  required DOMString topWindowHostname;
+  required USVString seller;
+  required long joinCount;
+  required long bidCount;
+  required long recency;
+
+  USVString topLevelSeller;
+  sequence<PreviousWin> prevWinsMs;
+  object wasmHelper;
+  unsigned long dataVersion;
+};
+
+dictionary ScoringBrowserSignals {
+  required DOMString topWindowHostname;
+  required USVString interestGroupOwner;
+  required USVString renderURL;
+  required unsigned long biddingDurationMsec;
+  required DOMString bidCurrency;
+
+  unsigned long dataVersion;
+  sequence<USVString> adComponents;
+};
+
+dictionary ReportingBrowserSignals {
+  required DOMString topWindowHostname;
+  required USVString interestGroupOwner;
+  required USVString renderURL;
   required double bid;
-  required (DOMString or AdRender) adRender;
-  any ad;
-  sequence<(DOMString or AdRender)> adComponents;
+  required double highestScoringOtherBid;
+
+  DOMString bidCurrency;
+  DOMString highestScoringOtherBidCurrency;
+  USVString topLevelSeller;
+  USVString componentSeller;
+
+  USVString buyerAndSellerReportingId;
+};
+
+dictionary ReportResultBrowserSignals : ReportingBrowserSignals {
+  required double desirability;
+
+  DOMString topLevelSellerSignals;
+  double modifiedBid;
+  unsigned long dataVersion;
+};
+
+dictionary ReportWinBrowserSignals : ReportingBrowserSignals {
   double adCost;
-  double modelingSignals;
-  boolean allowComponentAuction = false;
+  USVString seller;
+  boolean madeHighestScoringOtherBid;
+  DOMString interestGroupName;
+  DOMString buyerReportingId;
+  unsigned short modelingSignals;
+  unsigned long dataVersion;
+  KAnonStatus kAnonStatus;
 };
 
-[SecureContext]
-partial interface Navigator {
-  undefined updateAdInterestGroups();
+enum KAnonStatus { "passedAndEnforced", "passedNotEnforced", "belowThreshold", "notCalculated" };
+
+dictionary DirectFromSellerSignalsForBuyer {
+  any auctionSignals = null;
+  any perBuyerSignals = null;
+};
+
+dictionary DirectFromSellerSignalsForSeller {
+  any auctionSignals = null;
+  any sellerSignals = null;
+};
+
+dictionary ScoreAdOutput {
+  required double desirability;
+  double bid;
+  DOMString bidCurrency;
+  double incomingBidInSellerCurrency;
+  boolean allowComponentAuction = false;
 };
diff --git a/test/wpt/tests/interfaces/ua-client-hints.idl b/test/wpt/tests/interfaces/ua-client-hints.idl
index c69714b9734..6a40e1bdc4b 100644
--- a/test/wpt/tests/interfaces/ua-client-hints.idl
+++ b/test/wpt/tests/interfaces/ua-client-hints.idl
@@ -12,7 +12,7 @@ dictionary UADataValues {
   DOMString architecture;
   DOMString bitness;
   sequence<NavigatorUABrandVersion> brands;
-  DOMString formFactor;
+  sequence<DOMString> formFactor;
   sequence<NavigatorUABrandVersion> fullVersionList;
   DOMString model;
   boolean mobile;
diff --git a/test/wpt/tests/interfaces/uievents.idl b/test/wpt/tests/interfaces/uievents.idl
index 5fdc812e700..fef90d48410 100644
--- a/test/wpt/tests/interfaces/uievents.idl
+++ b/test/wpt/tests/interfaces/uievents.idl
@@ -32,6 +32,8 @@ interface MouseEvent : UIEvent {
   readonly attribute long screenY;
   readonly attribute long clientX;
   readonly attribute long clientY;
+  readonly attribute long layerX;
+  readonly attribute long layerY;
 
   readonly attribute boolean ctrlKey;
   readonly attribute boolean shiftKey;
diff --git a/test/wpt/tests/interfaces/urlpattern.idl b/test/wpt/tests/interfaces/urlpattern.idl
index e342eb50abd..788486bb627 100644
--- a/test/wpt/tests/interfaces/urlpattern.idl
+++ b/test/wpt/tests/interfaces/urlpattern.idl
@@ -1,7 +1,7 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into webref
 // (https://github.com/w3c/webref)
-// Source: URLPattern API (https://wicg.github.io/urlpattern/)
+// Source: URL Pattern Standard (https://urlpattern.spec.whatwg.org/)
 
 typedef (USVString or URLPatternInit) URLPatternInput;
 
diff --git a/test/wpt/tests/interfaces/web-animations.idl b/test/wpt/tests/interfaces/web-animations.idl
index 956d700f49b..1bc82fab119 100644
--- a/test/wpt/tests/interfaces/web-animations.idl
+++ b/test/wpt/tests/interfaces/web-animations.idl
@@ -18,29 +18,29 @@ interface DocumentTimeline : AnimationTimeline {
 
 [Exposed=Window]
 interface Animation : EventTarget {
-    constructor(optional AnimationEffect? effect = null,
-                optional AnimationTimeline? timeline);
-             attribute DOMString                id;
-             attribute AnimationEffect?         effect;
-             attribute AnimationTimeline?       timeline;
-             attribute double                   playbackRate;
-    readonly attribute AnimationPlayState       playState;
-    readonly attribute AnimationReplaceState    replaceState;
-    readonly attribute boolean                  pending;
-    readonly attribute Promise<Animation>       ready;
-    readonly attribute Promise<Animation>       finished;
-             attribute EventHandler             onfinish;
-             attribute EventHandler             oncancel;
-             attribute EventHandler             onremove;
-    undefined cancel();
-    undefined finish();
-    undefined play();
-    undefined pause();
-    undefined updatePlaybackRate(double playbackRate);
-    undefined reverse();
-    undefined persist();
-    [CEReactions]
-    undefined commitStyles();
+  constructor(optional AnimationEffect? effect = null,
+              optional AnimationTimeline? timeline);
+           attribute DOMString                id;
+           attribute AnimationEffect?         effect;
+           attribute AnimationTimeline?       timeline;
+           attribute double                   playbackRate;
+  readonly attribute AnimationPlayState       playState;
+  readonly attribute AnimationReplaceState    replaceState;
+  readonly attribute boolean                  pending;
+  readonly attribute Promise<Animation>       ready;
+  readonly attribute Promise<Animation>       finished;
+           attribute EventHandler             onfinish;
+           attribute EventHandler             oncancel;
+           attribute EventHandler             onremove;
+  undefined cancel();
+  undefined finish();
+  undefined play();
+  undefined pause();
+  undefined updatePlaybackRate(double playbackRate);
+  undefined reverse();
+  undefined persist();
+  [CEReactions]
+  undefined commitStyles();
 };
 
 enum AnimationPlayState { "idle", "running", "paused", "finished" };
@@ -55,22 +55,22 @@ interface AnimationEffect {
 };
 
 dictionary EffectTiming {
-    FillMode                           fill = "auto";
-    double                             iterationStart = 0.0;
-    unrestricted double                iterations = 1.0;
-    PlaybackDirection                  direction = "normal";
-    DOMString                          easing = "linear";
+  FillMode                           fill = "auto";
+  double                             iterationStart = 0.0;
+  unrestricted double                iterations = 1.0;
+  PlaybackDirection                  direction = "normal";
+  DOMString                          easing = "linear";
 };
 
 dictionary OptionalEffectTiming {
-    double                             delay;
-    double                             endDelay;
-    FillMode                           fill;
-    double                             iterationStart;
-    unrestricted double                iterations;
-    (unrestricted double or DOMString) duration;
-    PlaybackDirection                  direction;
-    DOMString                          easing;
+  double                             delay;
+  double                             endDelay;
+  FillMode                           fill;
+  double                             iterationStart;
+  unrestricted double                iterations;
+  (unrestricted double or DOMString) duration;
+  PlaybackDirection                  direction;
+  DOMString                          easing;
 };
 
 enum FillMode { "none", "forwards", "backwards", "both", "auto" };
@@ -78,21 +78,21 @@ enum FillMode { "none", "forwards", "backwards", "both", "auto" };
 enum PlaybackDirection { "normal", "reverse", "alternate", "alternate-reverse" };
 
 dictionary ComputedEffectTiming : EffectTiming {
-    double?              progress;
-    unrestricted double? currentIteration;
+  double?              progress;
+  unrestricted double? currentIteration;
 };
 
 [Exposed=Window]
 interface KeyframeEffect : AnimationEffect {
-    constructor(Element? target,
-                object? keyframes,
-                optional (unrestricted double or KeyframeEffectOptions) options = {});
-    constructor(KeyframeEffect source);
-    attribute Element?           target;
-    attribute CSSOMString?       pseudoElement;
-    attribute CompositeOperation composite;
-    sequence<object> getKeyframes();
-    undefined        setKeyframes(object? keyframes);
+  constructor(Element?       target,
+              object?        keyframes,
+              optional (unrestricted double or KeyframeEffectOptions) options = {});
+  constructor(KeyframeEffect source);
+  attribute Element?           target;
+  attribute CSSOMString?       pseudoElement;
+  attribute CompositeOperation composite;
+  sequence<object> getKeyframes();
+  undefined        setKeyframes(object? keyframes);
 };
 
 dictionary BaseComputedKeyframe {
@@ -103,15 +103,15 @@ dictionary BaseComputedKeyframe {
 };
 
 dictionary BasePropertyIndexedKeyframe {
-    (double? or sequence<double?>)                         offset = [];
-    (DOMString or sequence<DOMString>)                     easing = [];
-    (CompositeOperationOrAuto or sequence<CompositeOperationOrAuto>) composite = [];
+  (double? or sequence<double?>)                         offset = [];
+  (DOMString or sequence<DOMString>)                     easing = [];
+  (CompositeOperationOrAuto or sequence<CompositeOperationOrAuto>) composite = [];
 };
 
 dictionary BaseKeyframe {
-    double?                  offset = null;
-    DOMString                easing = "linear";
-    CompositeOperationOrAuto composite = "auto";
+  double?                  offset = null;
+  DOMString                easing = "linear";
+  CompositeOperationOrAuto composite = "auto";
 };
 
 dictionary KeyframeEffectOptions : EffectTiming {
diff --git a/test/wpt/tests/interfaces/web-bluetooth-scanning.idl b/test/wpt/tests/interfaces/web-bluetooth-scanning.idl
new file mode 100644
index 00000000000..88016e3e28e
--- /dev/null
+++ b/test/wpt/tests/interfaces/web-bluetooth-scanning.idl
@@ -0,0 +1,67 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: Web Bluetooth Scanning (https://webbluetoothcg.github.io/web-bluetooth/scanning.html)
+
+dictionary BluetoothLEScanOptions {
+  sequence<BluetoothLEScanFilterInit> filters;
+  boolean keepRepeatedDevices = false;
+  boolean acceptAllAdvertisements = false;
+};
+
+partial interface Bluetooth {
+  [SecureContext]
+  Promise<BluetoothLEScan> requestLEScan(optional BluetoothLEScanOptions options = {});
+};
+
+[Exposed=Window, SecureContext]
+interface BluetoothDataFilter {
+  constructor(optional BluetoothDataFilterInit init = {});
+  readonly attribute ArrayBuffer dataPrefix;
+  readonly attribute ArrayBuffer mask;
+};
+
+[Exposed=Window, SecureContext]
+interface BluetoothManufacturerDataFilter {
+  constructor(optional object init);
+  readonly maplike<unsigned short, BluetoothDataFilter>;
+};
+
+[Exposed=Window, SecureContext]
+interface BluetoothServiceDataFilter {
+  constructor(optional object init);
+  readonly maplike<UUID, BluetoothDataFilter>;
+};
+
+[Exposed=Window, SecureContext]
+interface BluetoothLEScanFilter {
+  constructor(optional BluetoothLEScanFilterInit init = {});
+  readonly attribute DOMString? name;
+  readonly attribute DOMString? namePrefix;
+  readonly attribute FrozenArray<UUID> services;
+  readonly attribute BluetoothManufacturerDataFilter manufacturerData;
+  readonly attribute BluetoothServiceDataFilter serviceData;
+};
+
+[Exposed=Window, SecureContext]
+interface BluetoothLEScan {
+  readonly attribute FrozenArray<BluetoothLEScanFilter> filters;
+  readonly attribute boolean keepRepeatedDevices;
+  readonly attribute boolean acceptAllAdvertisements;
+
+  readonly attribute boolean active;
+
+  undefined stop();
+};
+
+dictionary BluetoothLEScanPermissionDescriptor : PermissionDescriptor {
+  // These match BluetoothLEScanOptions.
+  sequence<BluetoothLEScanFilterInit> filters;
+  boolean keepRepeatedDevices = false;
+  boolean acceptAllAdvertisements = false;
+};
+
+[Exposed=Window, SecureContext]
+interface BluetoothLEScanPermissionResult : PermissionStatus {
+  attribute FrozenArray<BluetoothLEScan> scans;
+};
diff --git a/test/wpt/tests/interfaces/webaudio.idl b/test/wpt/tests/interfaces/webaudio.idl
index 1569de204bd..73dc35d2609 100644
--- a/test/wpt/tests/interfaces/webaudio.idl
+++ b/test/wpt/tests/interfaces/webaudio.idl
@@ -9,6 +9,11 @@ enum AudioContextState {
     "closed"
 };
 
+enum AudioContextRenderSizeCategory {
+    "default",
+    "hardware"
+};
+
 callback DecodeErrorCallback = undefined (DOMException error);
 
 callback DecodeSuccessCallback = undefined (AudioBuffer decodedData);
@@ -20,6 +25,7 @@ interface BaseAudioContext : EventTarget {
     readonly attribute double currentTime;
     readonly attribute AudioListener listener;
     readonly attribute AudioContextState state;
+    readonly attribute unsigned long renderQuantumSize;
     [SameObject, SecureContext]
     readonly attribute AudioWorklet audioWorklet;
     attribute EventHandler onstatechange;
@@ -92,6 +98,7 @@ dictionary AudioContextOptions {
     (AudioContextLatencyCategory or double) latencyHint = "interactive";
     float sampleRate;
     (DOMString or AudioSinkOptions) sinkId;
+    (AudioContextRenderSizeCategory or unsigned long) renderSizeHint = "default";
 };
 
 dictionary AudioSinkOptions {
@@ -150,6 +157,7 @@ dictionary OfflineAudioContextOptions {
     unsigned long numberOfChannels = 1;
     required unsigned long length;
     required float sampleRate;
+    (AudioContextRenderSizeCategory or unsigned long) renderSizeHint = "default";
 };
 
 [Exposed=Window]
@@ -629,6 +637,7 @@ interface AudioWorkletGlobalScope : WorkletGlobalScope {
     readonly attribute unsigned long long currentFrame;
     readonly attribute double currentTime;
     readonly attribute float sampleRate;
+    readonly attribute unsigned long renderQuantumSize;
     readonly attribute MessagePort port;
 };
 
diff --git a/test/wpt/tests/interfaces/webauthn.idl b/test/wpt/tests/interfaces/webauthn.idl
index 9a37207ba2c..e28355eb78d 100644
--- a/test/wpt/tests/interfaces/webauthn.idl
+++ b/test/wpt/tests/interfaces/webauthn.idl
@@ -1,20 +1,22 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into webref
 // (https://github.com/w3c/webref)
-// Source: Web Authentication: An API for accessing Public Key Credentials - Level (https://w3c.github.io/webauthn/)
+// Source: Web Authentication: An API for accessing Public Key Credentials - Level 3 (https://w3c.github.io/webauthn/)
 
 [SecureContext, Exposed=Window]
 interface PublicKeyCredential : Credential {
     [SameObject] readonly attribute ArrayBuffer              rawId;
     [SameObject] readonly attribute AuthenticatorResponse    response;
-    [SameObject] readonly attribute DOMString?               authenticatorAttachment;
+    readonly attribute DOMString?                            authenticatorAttachment;
     AuthenticationExtensionsClientOutputs getClientExtensionResults();
     static Promise<boolean> isConditionalMediationAvailable();
     PublicKeyCredentialJSON toJSON();
 };
 
 typedef DOMString Base64URLString;
-typedef (RegistrationResponseJSON or AuthenticationResponseJSON) PublicKeyCredentialJSON;
+// The structure of this object will be either
+// RegistrationResponseJSON or AuthenticationResponseJSON
+typedef object PublicKeyCredentialJSON;
 
 dictionary RegistrationResponseJSON {
     required Base64URLString id;
@@ -27,8 +29,19 @@ dictionary RegistrationResponseJSON {
 
 dictionary AuthenticatorAttestationResponseJSON {
     required Base64URLString clientDataJSON;
-    required Base64URLString attestationObject;
+    required Base64URLString authenticatorData;
     required sequence<DOMString> transports;
+    // The publicKey field will be missing if pubKeyCredParams was used to
+    // negotiate a public-key algorithm that the user agent doesn’t
+    // understand. (See section “Easily accessing credential data” for a
+    // list of which algorithms user agents must support.) If using such an
+    // algorithm then the public key must be parsed directly from
+    // attestationObject or authenticatorData.
+    Base64URLString publicKey;
+    required long long publicKeyAlgorithm;
+    // This value contains copies of some of the fields above. See
+    // section “Easily accessing credential data”.
+    required Base64URLString attestationObject;
 };
 
 dictionary AuthenticationResponseJSON {
@@ -45,6 +58,7 @@ dictionary AuthenticatorAssertionResponseJSON {
     required Base64URLString authenticatorData;
     required Base64URLString signature;
     Base64URLString userHandle;
+    Base64URLString attestationObject;
 };
 
 dictionary AuthenticationExtensionsClientOutputsJSON {
@@ -62,6 +76,10 @@ partial interface PublicKeyCredential {
     static Promise<boolean> isUserVerifyingPlatformAuthenticatorAvailable();
 };
 
+partial interface PublicKeyCredential {
+    static Promise<boolean> isPasskeyPlatformAuthenticatorAvailable();
+};
+
 partial interface PublicKeyCredential {
     static PublicKeyCredentialCreationOptions parseCreationOptionsFromJSON(PublicKeyCredentialCreationOptionsJSON options);
 };
@@ -74,7 +92,9 @@ dictionary PublicKeyCredentialCreationOptionsJSON {
     unsigned long                                           timeout;
     sequence<PublicKeyCredentialDescriptorJSON>             excludeCredentials = [];
     AuthenticatorSelectionCriteria                          authenticatorSelection;
+    sequence<DOMString>                                     hints = [];
     DOMString                                               attestation = "none";
+    sequence<DOMString>                                     attestationFormats = [];
     AuthenticationExtensionsClientInputsJSON                extensions;
 };
 
@@ -103,6 +123,9 @@ dictionary PublicKeyCredentialRequestOptionsJSON {
     DOMString                                               rpId;
     sequence<PublicKeyCredentialDescriptorJSON>             allowCredentials = [];
     DOMString                                               userVerification = "preferred";
+    sequence<DOMString>                                     hints = [];
+    DOMString                                               attestation = "none";
+    sequence<DOMString>                                     attestationFormats = [];
     AuthenticationExtensionsClientInputsJSON                extensions;
 };
 
@@ -143,6 +166,7 @@ dictionary PublicKeyCredentialCreationOptions {
     unsigned long                                timeout;
     sequence<PublicKeyCredentialDescriptor>      excludeCredentials = [];
     AuthenticatorSelectionCriteria               authenticatorSelection;
+    sequence<DOMString>                          hints = [];
     DOMString                                    attestation = "none";
     sequence<DOMString>                          attestationFormats = [];
     AuthenticationExtensionsClientInputs         extensions;
@@ -192,6 +216,7 @@ dictionary PublicKeyCredentialRequestOptions {
     USVString                            rpId;
     sequence<PublicKeyCredentialDescriptor> allowCredentials = [];
     DOMString                            userVerification = "preferred";
+    sequence<DOMString>                  hints = [];
     DOMString                            attestation = "none";
     sequence<DOMString>                  attestationFormats = [];
     AuthenticationExtensionsClientInputs extensions;
@@ -245,6 +270,12 @@ enum UserVerificationRequirement {
     "discouraged"
 };
 
+enum PublicKeyCredentialHints {
+    "security-key",
+    "client-device",
+    "hybrid",
+};
+
 partial dictionary AuthenticationExtensionsClientInputs {
   USVString appid;
 };
@@ -267,6 +298,7 @@ partial dictionary AuthenticationExtensionsClientInputs {
 
 dictionary CredentialPropertiesOutput {
     boolean rk;
+    USVString authenticatorDisplayName;
 };
 
 partial dictionary AuthenticationExtensionsClientOutputs {
@@ -332,19 +364,20 @@ partial dictionary AuthenticationExtensionsClientOutputs {
   UvmEntries uvm;
 };
 
-dictionary AuthenticationExtensionsDevicePublicKeyInputs {
-    DOMString attestation = "none";
+dictionary AuthenticationExtensionsSupplementalPubKeysInputs {
+    required sequence<DOMString> scopes;
+    DOMString attestation = "indirect";
     sequence<DOMString> attestationFormats = [];
 };
 
 partial dictionary AuthenticationExtensionsClientInputs {
-    AuthenticationExtensionsDevicePublicKeyInputs devicePubKey;
+    AuthenticationExtensionsSupplementalPubKeysInputs supplementalPubKeys;
 };
 
-dictionary AuthenticationExtensionsDevicePublicKeyOutputs {
-    ArrayBuffer signature;
+dictionary AuthenticationExtensionsSupplementalPubKeysOutputs {
+    sequence<ArrayBuffer> signatures;
 };
 
 partial dictionary AuthenticationExtensionsClientOutputs {
-    AuthenticationExtensionsDevicePublicKeyOutputs devicePubKey;
+    AuthenticationExtensionsSupplementalPubKeysOutputs supplementalPubKeys;
 };
diff --git a/test/wpt/tests/interfaces/webcodecs-hevc-codec-registration.idl b/test/wpt/tests/interfaces/webcodecs-hevc-codec-registration.idl
index b767db89e6f..92043748c49 100644
--- a/test/wpt/tests/interfaces/webcodecs-hevc-codec-registration.idl
+++ b/test/wpt/tests/interfaces/webcodecs-hevc-codec-registration.idl
@@ -15,3 +15,11 @@ enum HevcBitstreamFormat {
   "annexb",
   "hevc",
 };
+
+partial dictionary VideoEncoderEncodeOptions {
+  VideoEncoderEncodeOptionsForHevc hevc;
+};
+
+dictionary VideoEncoderEncodeOptionsForHevc {
+  unsigned short? quantizer;
+};
diff --git a/test/wpt/tests/interfaces/webcodecs.idl b/test/wpt/tests/interfaces/webcodecs.idl
index 0b95dc8b757..48d89d0b477 100644
--- a/test/wpt/tests/interfaces/webcodecs.idl
+++ b/test/wpt/tests/interfaces/webcodecs.idl
@@ -146,7 +146,7 @@ dictionary AudioDecoderConfig {
 
 dictionary VideoDecoderConfig {
   required DOMString codec;
-  [AllowShared] BufferSource description;
+  AllowSharedBufferSource description;
   [EnforceRange] unsigned long codedWidth;
   [EnforceRange] unsigned long codedHeight;
   [EnforceRange] unsigned long displayAspectWidth;
@@ -161,7 +161,7 @@ dictionary AudioEncoderConfig {
   [EnforceRange] unsigned long sampleRate;
   [EnforceRange] unsigned long numberOfChannels;
   [EnforceRange] unsigned long long bitrate;
-  BitrateMode bitrateMode;
+  BitrateMode bitrateMode = "variable";
 };
 
 dictionary VideoEncoderConfig {
@@ -177,6 +177,7 @@ dictionary VideoEncoderConfig {
   DOMString scalabilityMode;
   VideoEncoderBitrateMode bitrateMode = "variable";
   LatencyMode latencyMode = "quality";
+  DOMString contentHint;
 };
 
 enum HardwareAcceleration {
@@ -221,7 +222,7 @@ interface EncodedAudioChunk {
   readonly attribute unsigned long long? duration; // microseconds
   readonly attribute unsigned long byteLength;
 
-  undefined copyTo([AllowShared] BufferSource destination);
+  undefined copyTo(AllowSharedBufferSource destination);
 };
 
 dictionary EncodedAudioChunkInit {
@@ -229,6 +230,7 @@ dictionary EncodedAudioChunkInit {
   [EnforceRange] required long long timestamp;    // microseconds
   [EnforceRange] unsigned long long duration;     // microseconds
   required BufferSource data;
+  sequence<ArrayBuffer> transfer = [];
 };
 
 enum EncodedAudioChunkType {
@@ -244,14 +246,15 @@ interface EncodedVideoChunk {
   readonly attribute unsigned long long? duration;    // microseconds
   readonly attribute unsigned long byteLength;
 
-  undefined copyTo([AllowShared] BufferSource destination);
+  undefined copyTo(AllowSharedBufferSource destination);
 };
 
 dictionary EncodedVideoChunkInit {
   required EncodedVideoChunkType type;
   [EnforceRange] required long long timestamp;        // microseconds
   [EnforceRange] unsigned long long duration;         // microseconds
-  required [AllowShared] BufferSource data;
+  required AllowSharedBufferSource data;
+  sequence<ArrayBuffer> transfer = [];
 };
 
 enum EncodedVideoChunkType {
@@ -271,7 +274,7 @@ interface AudioData {
   readonly attribute long long timestamp;          // microseconds
 
   unsigned long allocationSize(AudioDataCopyToOptions options);
-  undefined copyTo([AllowShared] BufferSource destination, AudioDataCopyToOptions options);
+  undefined copyTo(AllowSharedBufferSource destination, AudioDataCopyToOptions options);
   AudioData clone();
   undefined close();
 };
@@ -283,6 +286,7 @@ dictionary AudioDataInit {
   [EnforceRange] required unsigned long numberOfChannels;
   [EnforceRange] required long long timestamp;  // microseconds
   required BufferSource data;
+  sequence<ArrayBuffer> transfer = [];
 };
 
 dictionary AudioDataCopyToOptions {
@@ -306,7 +310,7 @@ enum AudioSampleFormat {
 [Exposed=(Window,DedicatedWorker), Serializable, Transferable]
 interface VideoFrame {
   constructor(CanvasImageSource image, optional VideoFrameInit init = {});
-  constructor([AllowShared] BufferSource data, VideoFrameBufferInit init);
+  constructor(AllowSharedBufferSource data, VideoFrameBufferInit init);
 
   readonly attribute VideoPixelFormat? format;
   readonly attribute unsigned long codedWidth;
@@ -324,7 +328,7 @@ interface VideoFrame {
   unsigned long allocationSize(
       optional VideoFrameCopyToOptions options = {});
   Promise<sequence<PlaneLayout>> copyTo(
-      [AllowShared] BufferSource destination,
+      AllowSharedBufferSource destination,
       optional VideoFrameCopyToOptions options = {});
   VideoFrame clone();
   undefined close();
@@ -365,6 +369,8 @@ dictionary VideoFrameBufferInit {
   [EnforceRange] unsigned long displayHeight;
 
   VideoColorSpaceInit colorSpace;
+
+  sequence<ArrayBuffer> transfer = [];
 };
 
 dictionary VideoFrameMetadata {
@@ -470,6 +476,7 @@ dictionary ImageDecoderInit {
   [EnforceRange] unsigned long desiredWidth;
   [EnforceRange] unsigned long desiredHeight;
   boolean preferAnimation;
+  sequence<ArrayBuffer> transfer = [];
 };
 
 dictionary ImageDecodeOptions {
diff --git a/test/wpt/tests/interfaces/webgl1.idl b/test/wpt/tests/interfaces/webgl1.idl
index 3912e9a4b04..b61f031ab28 100644
--- a/test/wpt/tests/interfaces/webgl1.idl
+++ b/test/wpt/tests/interfaces/webgl1.idl
@@ -685,8 +685,8 @@ interface mixin WebGLRenderingContextBase
 interface mixin WebGLRenderingContextOverloads
 {
     undefined bufferData(GLenum target, GLsizeiptr size, GLenum usage);
-    undefined bufferData(GLenum target, [AllowShared] BufferSource? data, GLenum usage);
-    undefined bufferSubData(GLenum target, GLintptr offset, [AllowShared] BufferSource data);
+    undefined bufferData(GLenum target, AllowSharedBufferSource? data, GLenum usage);
+    undefined bufferSubData(GLenum target, GLintptr offset, AllowSharedBufferSource data);
 
     undefined compressedTexImage2D(GLenum target, GLint level, GLenum internalformat,
                                    GLsizei width, GLsizei height, GLint border,
diff --git a/test/wpt/tests/interfaces/webgl2.idl b/test/wpt/tests/interfaces/webgl2.idl
index 22e2d6fa324..9cb639932e8 100644
--- a/test/wpt/tests/interfaces/webgl2.idl
+++ b/test/wpt/tests/interfaces/webgl2.idl
@@ -304,7 +304,7 @@ interface mixin WebGL2RenderingContextBase
   // can not be exposed safely to JavaScript. GetBufferSubData
   // replaces it for the purpose of fetching data back from the GPU.
   undefined getBufferSubData(GLenum target, GLintptr srcByteOffset, [AllowShared] ArrayBufferView dstBuffer,
-                             optional GLuint dstOffset = 0, optional GLuint length = 0);
+                             optional unsigned long long dstOffset = 0, optional GLuint length = 0);
 
   /* Framebuffer objects */
   undefined blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0,
@@ -336,7 +336,7 @@ interface mixin WebGL2RenderingContextBase
                        GLsizei depth, GLint border, GLenum format, GLenum type, [AllowShared] ArrayBufferView? srcData);
   undefined texImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                        GLsizei depth, GLint border, GLenum format, GLenum type, [AllowShared] ArrayBufferView srcData,
-                       GLuint srcOffset);
+                       unsigned long long srcOffset);
 
   undefined texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                           GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
@@ -346,7 +346,7 @@ interface mixin WebGL2RenderingContextBase
                           TexImageSource source); // May throw DOMException
   undefined texSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                           GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
-                          [AllowShared] ArrayBufferView? srcData, optional GLuint srcOffset = 0);
+                          [AllowShared] ArrayBufferView? srcData, optional unsigned long long srcOffset = 0);
 
   undefined copyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
                               GLint x, GLint y, GLsizei width, GLsizei height);
@@ -355,7 +355,7 @@ interface mixin WebGL2RenderingContextBase
                                  GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLintptr offset);
   undefined compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
                                  GLsizei height, GLsizei depth, GLint border, [AllowShared] ArrayBufferView srcData,
-                                 optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
+                                 optional unsigned long long srcOffset = 0, optional GLuint srcLengthOverride = 0);
 
   undefined compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                                     GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
@@ -363,7 +363,7 @@ interface mixin WebGL2RenderingContextBase
   undefined compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                                     GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
                                     GLenum format, [AllowShared] ArrayBufferView srcData,
-                                    optional GLuint srcOffset = 0,
+                                    optional unsigned long long srcOffset = 0,
                                     optional GLuint srcLengthOverride = 0);
 
   /* Programs and shaders */
@@ -375,28 +375,28 @@ interface mixin WebGL2RenderingContextBase
   undefined uniform3ui(WebGLUniformLocation? location, GLuint v0, GLuint v1, GLuint v2);
   undefined uniform4ui(WebGLUniformLocation? location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
 
-  undefined uniform1uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+  undefined uniform1uiv(WebGLUniformLocation? location, Uint32List data, optional unsigned long long srcOffset = 0,
                         optional GLuint srcLength = 0);
-  undefined uniform2uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+  undefined uniform2uiv(WebGLUniformLocation? location, Uint32List data, optional unsigned long long srcOffset = 0,
                         optional GLuint srcLength = 0);
-  undefined uniform3uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+  undefined uniform3uiv(WebGLUniformLocation? location, Uint32List data, optional unsigned long long srcOffset = 0,
                         optional GLuint srcLength = 0);
-  undefined uniform4uiv(WebGLUniformLocation? location, Uint32List data, optional GLuint srcOffset = 0,
+  undefined uniform4uiv(WebGLUniformLocation? location, Uint32List data, optional unsigned long long srcOffset = 0,
                         optional GLuint srcLength = 0);
   undefined uniformMatrix3x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
-                               optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+                               optional unsigned long long srcOffset = 0, optional GLuint srcLength = 0);
   undefined uniformMatrix4x2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
-                               optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+                               optional unsigned long long srcOffset = 0, optional GLuint srcLength = 0);
 
   undefined uniformMatrix2x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
-                               optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+                               optional unsigned long long srcOffset = 0, optional GLuint srcLength = 0);
   undefined uniformMatrix4x3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
-                               optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+                               optional unsigned long long srcOffset = 0, optional GLuint srcLength = 0);
 
   undefined uniformMatrix2x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
-                               optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+                               optional unsigned long long srcOffset = 0, optional GLuint srcLength = 0);
   undefined uniformMatrix3x4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
-                               optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+                               optional unsigned long long srcOffset = 0, optional GLuint srcLength = 0);
 
   /* Vertex attribs */
   undefined vertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w);
@@ -415,11 +415,11 @@ interface mixin WebGL2RenderingContextBase
   undefined drawBuffers(sequence<GLenum> buffers);
 
   undefined clearBufferfv(GLenum buffer, GLint drawbuffer, Float32List values,
-                          optional GLuint srcOffset = 0);
+                          optional unsigned long long srcOffset = 0);
   undefined clearBufferiv(GLenum buffer, GLint drawbuffer, Int32List values,
-                          optional GLuint srcOffset = 0);
+                          optional unsigned long long srcOffset = 0);
   undefined clearBufferuiv(GLenum buffer, GLint drawbuffer, Uint32List values,
-                           optional GLuint srcOffset = 0);
+                           optional unsigned long long srcOffset = 0);
 
   undefined clearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
 
@@ -483,13 +483,13 @@ interface mixin WebGL2RenderingContextOverloads
 {
   // WebGL1:
   undefined bufferData(GLenum target, GLsizeiptr size, GLenum usage);
-  undefined bufferData(GLenum target, [AllowShared] BufferSource? srcData, GLenum usage);
-  undefined bufferSubData(GLenum target, GLintptr dstByteOffset, [AllowShared] BufferSource srcData);
+  undefined bufferData(GLenum target, AllowSharedBufferSource? srcData, GLenum usage);
+  undefined bufferSubData(GLenum target, GLintptr dstByteOffset, AllowSharedBufferSource srcData);
   // WebGL2:
-  undefined bufferData(GLenum target, [AllowShared] ArrayBufferView srcData, GLenum usage, GLuint srcOffset,
+  undefined bufferData(GLenum target, [AllowShared] ArrayBufferView srcData, GLenum usage, unsigned long long srcOffset,
                        optional GLuint length = 0);
   undefined bufferSubData(GLenum target, GLintptr dstByteOffset, [AllowShared] ArrayBufferView srcData,
-                          GLuint srcOffset, optional GLuint length = 0);
+                          unsigned long long srcOffset, optional GLuint length = 0);
 
   // WebGL1 legacy entrypoints:
   undefined texImage2D(GLenum target, GLint level, GLint internalformat,
@@ -512,7 +512,7 @@ interface mixin WebGL2RenderingContextOverloads
                        TexImageSource source); // May throw DOMException
   undefined texImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height,
                        GLint border, GLenum format, GLenum type, [AllowShared] ArrayBufferView srcData,
-                       GLuint srcOffset);
+                       unsigned long long srcOffset);
 
   undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
                           GLsizei height, GLenum format, GLenum type, GLintptr pboOffset);
@@ -521,46 +521,46 @@ interface mixin WebGL2RenderingContextOverloads
                           TexImageSource source); // May throw DOMException
   undefined texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width,
                           GLsizei height, GLenum format, GLenum type, [AllowShared] ArrayBufferView srcData,
-                          GLuint srcOffset);
+                          unsigned long long srcOffset);
 
   undefined compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
                                  GLsizei height, GLint border, GLsizei imageSize, GLintptr offset);
   undefined compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
                                  GLsizei height, GLint border, [AllowShared] ArrayBufferView srcData,
-                                 optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
+                                 optional unsigned long long srcOffset = 0, optional GLuint srcLengthOverride = 0);
 
   undefined compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                                     GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, GLintptr offset);
   undefined compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
                                     GLsizei width, GLsizei height, GLenum format,
                                     [AllowShared] ArrayBufferView srcData,
-                                    optional GLuint srcOffset = 0,
+                                    optional unsigned long long srcOffset = 0,
                                     optional GLuint srcLengthOverride = 0);
 
-  undefined uniform1fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+  undefined uniform1fv(WebGLUniformLocation? location, Float32List data, optional unsigned long long srcOffset = 0,
                        optional GLuint srcLength = 0);
-  undefined uniform2fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+  undefined uniform2fv(WebGLUniformLocation? location, Float32List data, optional unsigned long long srcOffset = 0,
                        optional GLuint srcLength = 0);
-  undefined uniform3fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+  undefined uniform3fv(WebGLUniformLocation? location, Float32List data, optional unsigned long long srcOffset = 0,
                        optional GLuint srcLength = 0);
-  undefined uniform4fv(WebGLUniformLocation? location, Float32List data, optional GLuint srcOffset = 0,
+  undefined uniform4fv(WebGLUniformLocation? location, Float32List data, optional unsigned long long srcOffset = 0,
                        optional GLuint srcLength = 0);
 
-  undefined uniform1iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+  undefined uniform1iv(WebGLUniformLocation? location, Int32List data, optional unsigned long long srcOffset = 0,
                        optional GLuint srcLength = 0);
-  undefined uniform2iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+  undefined uniform2iv(WebGLUniformLocation? location, Int32List data, optional unsigned long long srcOffset = 0,
                        optional GLuint srcLength = 0);
-  undefined uniform3iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+  undefined uniform3iv(WebGLUniformLocation? location, Int32List data, optional unsigned long long srcOffset = 0,
                        optional GLuint srcLength = 0);
-  undefined uniform4iv(WebGLUniformLocation? location, Int32List data, optional GLuint srcOffset = 0,
+  undefined uniform4iv(WebGLUniformLocation? location, Int32List data, optional unsigned long long srcOffset = 0,
                        optional GLuint srcLength = 0);
 
   undefined uniformMatrix2fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
-                             optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+                             optional unsigned long long srcOffset = 0, optional GLuint srcLength = 0);
   undefined uniformMatrix3fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
-                             optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+                             optional unsigned long long srcOffset = 0, optional GLuint srcLength = 0);
   undefined uniformMatrix4fv(WebGLUniformLocation? location, GLboolean transpose, Float32List data,
-                             optional GLuint srcOffset = 0, optional GLuint srcLength = 0);
+                             optional unsigned long long srcOffset = 0, optional GLuint srcLength = 0);
 
   /* Reading back pixels */
   // WebGL1:
@@ -570,7 +570,7 @@ interface mixin WebGL2RenderingContextOverloads
   undefined readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
                        GLintptr offset);
   undefined readPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type,
-                       [AllowShared] ArrayBufferView dstData, GLuint dstOffset);
+                       [AllowShared] ArrayBufferView dstData, unsigned long long dstOffset);
 };
 
 [Exposed=(Window,Worker)]
diff --git a/test/wpt/tests/interfaces/webgpu.idl b/test/wpt/tests/interfaces/webgpu.idl
index 25943d99c35..373d51dff13 100644
--- a/test/wpt/tests/interfaces/webgpu.idl
+++ b/test/wpt/tests/interfaces/webgpu.idl
@@ -8,7 +8,7 @@ interface mixin GPUObjectBase {
 };
 
 dictionary GPUObjectDescriptorBase {
-    USVString label;
+    USVString label = "";
 };
 
 [Exposed=(Window, DedicatedWorker), SecureContext]
@@ -95,7 +95,7 @@ interface GPUAdapter {
     readonly attribute boolean isFallbackAdapter;
 
     Promise<GPUDevice> requestDevice(optional GPUDeviceDescriptor descriptor = {});
-    Promise<GPUAdapterInfo> requestAdapterInfo(optional sequence<DOMString> unmaskHints = []);
+    Promise<GPUAdapterInfo> requestAdapterInfo();
 };
 
 dictionary GPUDeviceDescriptor
@@ -307,6 +307,7 @@ enum GPUTextureFormat {
     "bgra8unorm-srgb",
     // Packed 32-bit formats
     "rgb9e5ufloat",
+    "rgb10a2uint",
     "rgb10a2unorm",
     "rg11b10ufloat",
 
@@ -519,6 +520,8 @@ dictionary GPUTextureBindingLayout {
 
 enum GPUStorageTextureAccess {
     "write-only",
+    "read-only",
+    "read-write",
 };
 
 dictionary GPUStorageTextureBindingLayout {
@@ -574,10 +577,11 @@ dictionary GPUShaderModuleDescriptor
          : GPUObjectDescriptorBase {
     required USVString code;
     object sourceMap;
-    record<USVString, GPUShaderModuleCompilationHint> hints;
+    sequence<GPUShaderModuleCompilationHint> compilationHints = [];
 };
 
 dictionary GPUShaderModuleCompilationHint {
+    required USVString entryPoint;
     (GPUPipelineLayout or GPUAutoLayoutMode) layout;
 };
 
@@ -604,7 +608,7 @@ interface GPUCompilationInfo {
 
 [Exposed=(Window, DedicatedWorker), SecureContext, Serializable]
 interface GPUPipelineError : DOMException {
-    constructor((DOMString or undefined) message, GPUPipelineErrorInit options);
+    constructor(optional DOMString message = "", GPUPipelineErrorInit options);
     readonly attribute GPUPipelineErrorReason reason;
 };
 
@@ -632,7 +636,7 @@ interface mixin GPUPipelineBase {
 
 dictionary GPUProgrammableStage {
     required GPUShaderModule module;
-    required USVString entryPoint;
+    USVString entryPoint;
     record<USVString, GPUPipelineConstantValue> constants;
 };
 
@@ -759,8 +763,8 @@ enum GPUBlendOperation {
 dictionary GPUDepthStencilState {
     required GPUTextureFormat format;
 
-    required boolean depthWriteEnabled;
-    required GPUCompareFunction depthCompare;
+    boolean depthWriteEnabled;
+    GPUCompareFunction depthCompare;
 
     GPUStencilFaceState stencilFront = {};
     GPUStencilFaceState stencilBack = {};
@@ -827,6 +831,7 @@ enum GPUVertexFormat {
     "sint32x2",
     "sint32x3",
     "sint32x4",
+    "unorm10-10-10-2",
 };
 
 enum GPUVertexStepMode {
@@ -876,8 +881,16 @@ dictionary GPUImageCopyTextureTagged
     boolean premultipliedAlpha = false;
 };
 
+typedef (ImageBitmap or
+         ImageData or
+         HTMLImageElement or
+         HTMLVideoElement or
+         VideoFrame or
+         HTMLCanvasElement or
+         OffscreenCanvas) GPUImageCopyExternalImageSource;
+
 dictionary GPUImageCopyExternalImage {
-    required (ImageBitmap or HTMLVideoElement or HTMLCanvasElement or OffscreenCanvas) source;
+    required GPUImageCopyExternalImageSource source;
     GPUOrigin2D origin = {};
     boolean flipY = false;
 };
@@ -926,8 +939,6 @@ interface GPUCommandEncoder {
         optional GPUSize64 offset = 0,
         optional GPUSize64 size);
 
-    undefined writeTimestamp(GPUQuerySet querySet, GPUSize32 queryIndex);
-
     undefined resolveQuerySet(
         GPUQuerySet querySet,
         GPUSize32 firstQuery,
@@ -1026,6 +1037,7 @@ dictionary GPURenderPassDescriptor
 
 dictionary GPURenderPassColorAttachment {
     required GPUTextureView view;
+    GPUIntegerCoordinate depthSlice;
     GPUTextureView resolveTarget;
 
     GPUColor clearValue;
@@ -1119,13 +1131,13 @@ interface GPUQueue {
     undefined writeBuffer(
         GPUBuffer buffer,
         GPUSize64 bufferOffset,
-        [AllowShared] BufferSource data,
+        AllowSharedBufferSource data,
         optional GPUSize64 dataOffset = 0,
         optional GPUSize64 size);
 
     undefined writeTexture(
         GPUImageCopyTexture destination,
-        [AllowShared] BufferSource data,
+        AllowSharedBufferSource data,
         GPUImageDataLayout dataLayout,
         GPUExtent3D size);
 
diff --git a/test/wpt/tests/interfaces/webhid.idl b/test/wpt/tests/interfaces/webhid.idl
index a1a02d3e438..03e72511d96 100644
--- a/test/wpt/tests/interfaces/webhid.idl
+++ b/test/wpt/tests/interfaces/webhid.idl
@@ -17,7 +17,7 @@ interface HID : EventTarget {
     attribute EventHandler onconnect;
     attribute EventHandler ondisconnect;
     Promise<sequence<HIDDevice>> getDevices();
-    Promise<sequence<HIDDevice>> requestDevice(
+    [Exposed=Window] Promise<sequence<HIDDevice>> requestDevice(
         HIDDeviceRequestOptions options);
 };
 
diff --git a/test/wpt/tests/interfaces/webidl.idl b/test/wpt/tests/interfaces/webidl.idl
index 7271f19dfa6..4d0dfaa1062 100644
--- a/test/wpt/tests/interfaces/webidl.idl
+++ b/test/wpt/tests/interfaces/webidl.idl
@@ -9,6 +9,7 @@ typedef (Int8Array or Int16Array or Int32Array or
          Float32Array or Float64Array or DataView) ArrayBufferView;
 
 typedef (ArrayBufferView or ArrayBuffer) BufferSource;
+typedef (ArrayBuffer or SharedArrayBuffer or [AllowShared] ArrayBufferView) AllowSharedBufferSource;
 [Exposed=*,
  Serializable]
 interface DOMException { // but see below note about ECMAScript binding
diff --git a/test/wpt/tests/interfaces/webmidi.idl b/test/wpt/tests/interfaces/webmidi.idl
index 1acf1ac1d4c..9bab8a5f961 100644
--- a/test/wpt/tests/interfaces/webmidi.idl
+++ b/test/wpt/tests/interfaces/webmidi.idl
@@ -73,7 +73,7 @@ enum MIDIPortConnectionState {
 [SecureContext, Exposed=Window]
 interface MIDIMessageEvent : Event {
   constructor(DOMString type, optional MIDIMessageEventInit eventInitDict = {});
-  readonly attribute Uint8Array data;
+  readonly attribute Uint8Array? data;
 };
 
 dictionary MIDIMessageEventInit: EventInit {
@@ -83,7 +83,7 @@ dictionary MIDIMessageEventInit: EventInit {
 [SecureContext, Exposed=Window]
 interface MIDIConnectionEvent : Event {
   constructor(DOMString type, optional MIDIConnectionEventInit eventInitDict = {});
-  readonly attribute MIDIPort port;
+  readonly attribute MIDIPort? port;
 };
 
 dictionary MIDIConnectionEventInit: EventInit {
diff --git a/test/wpt/tests/interfaces/webnn.idl b/test/wpt/tests/interfaces/webnn.idl
index 17e30803b88..2a9d0e639fb 100644
--- a/test/wpt/tests/interfaces/webnn.idl
+++ b/test/wpt/tests/interfaces/webnn.idl
@@ -44,7 +44,7 @@ enum MLInputOperandLayout {
   "nhwc"
 };
 
-enum MLOperandType {
+enum MLOperandDataType {
   "float32",
   "float16",
   "int32",
@@ -54,8 +54,8 @@ enum MLOperandType {
 };
 
 dictionary MLOperandDescriptor {
-  // The operand type.
-  required MLOperandType type;
+  // The operand data type.
+  required MLOperandDataType dataType;
 
   // The dimensions field is only required for tensor operands.
   sequence<unsigned long> dimensions;
@@ -65,7 +65,8 @@ dictionary MLOperandDescriptor {
 interface MLOperand {};
 
 [SecureContext, Exposed=(Window, DedicatedWorker)]
-interface MLActivation {};
+interface MLActivation {
+};
 
 typedef record<DOMString, ArrayBufferView> MLNamedArrayBufferViews;
 
@@ -133,7 +134,7 @@ interface MLGraphBuilder {
   MLOperand constant(MLOperandDescriptor descriptor, MLBufferView bufferView);
 
   // Create a single-value operand from the specified number of the specified type.
-  MLOperand constant(double value, optional MLOperandType type = "float32");
+  MLOperand constant(double value, optional MLOperandDataType dataType = "float32");
 
   // Compile the graph up to the specified output operands asynchronously.
   Promise<MLGraph> build(MLNamedOperands outputs);
@@ -162,7 +163,7 @@ dictionary MLClampOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand clamp(MLOperand x, optional MLClampOptions options = {});
+  MLOperand clamp(MLOperand operand, optional MLClampOptions options = {});
   MLActivation clamp(optional MLClampOptions options = {});
 };
 
@@ -235,15 +236,15 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand abs(MLOperand x);
-  MLOperand ceil(MLOperand x);
-  MLOperand cos(MLOperand x);
-  MLOperand exp(MLOperand x);
-  MLOperand floor(MLOperand x);
-  MLOperand log(MLOperand x);
-  MLOperand neg(MLOperand x);
-  MLOperand sin(MLOperand x);
-  MLOperand tan(MLOperand x);
+  MLOperand abs(MLOperand input);
+  MLOperand ceil(MLOperand input);
+  MLOperand cos(MLOperand input);
+  MLOperand exp(MLOperand input);
+  MLOperand floor(MLOperand input);
+  MLOperand log(MLOperand input);
+  MLOperand neg(MLOperand input);
+  MLOperand sin(MLOperand input);
+  MLOperand tan(MLOperand input);
 };
 
 dictionary MLEluOptions {
@@ -251,7 +252,7 @@ dictionary MLEluOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand elu(MLOperand x, optional MLEluOptions options = {});
+  MLOperand elu(MLOperand input, optional MLEluOptions options = {});
   MLActivation elu(optional MLEluOptions options = {});
 };
 
@@ -315,12 +316,12 @@ dictionary MLHardSigmoidOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand hardSigmoid(MLOperand x, optional MLHardSigmoidOptions options = {});
+  MLOperand hardSigmoid(MLOperand input, optional MLHardSigmoidOptions options = {});
   MLActivation hardSigmoid(optional MLHardSigmoidOptions options = {});
 };
 
 partial interface MLGraphBuilder {
-  MLOperand hardSwish(MLOperand x);
+  MLOperand hardSwish(MLOperand input);
   MLActivation hardSwish();
 };
 
@@ -341,7 +342,7 @@ dictionary MLLeakyReluOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand leakyRelu(MLOperand x, optional MLLeakyReluOptions options = {});
+  MLOperand leakyRelu(MLOperand input, optional MLLeakyReluOptions options = {});
   MLActivation leakyRelu(optional MLLeakyReluOptions options = {});
 };
 
@@ -351,7 +352,7 @@ dictionary MLLinearOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand linear(MLOperand x, optional MLLinearOptions options = {});
+  MLOperand linear(MLOperand input, optional MLLinearOptions options = {});
   MLActivation linear(optional MLLinearOptions options = {});
 };
 
@@ -438,7 +439,7 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand prelu(MLOperand x, MLOperand slope);
+  MLOperand prelu(MLOperand input, MLOperand slope);
 };
 
 dictionary MLReduceOptions {
@@ -460,7 +461,7 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand relu(MLOperand x);
+  MLOperand relu(MLOperand input);
   MLActivation relu();
 };
 
@@ -485,7 +486,7 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand sigmoid(MLOperand x);
+  MLOperand sigmoid(MLOperand input);
   MLActivation sigmoid();
 };
 
@@ -494,7 +495,7 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand softmax(MLOperand x);
+  MLOperand softmax(MLOperand input);
   MLActivation softmax();
 };
 
@@ -503,12 +504,12 @@ dictionary MLSoftplusOptions {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand softplus(MLOperand x, optional MLSoftplusOptions options = {});
+  MLOperand softplus(MLOperand input, optional MLSoftplusOptions options = {});
   MLActivation softplus(optional MLSoftplusOptions options = {});
 };
 
 partial interface MLGraphBuilder {
-  MLOperand softsign(MLOperand x);
+  MLOperand softsign(MLOperand input);
   MLActivation softsign();
 };
 
@@ -531,7 +532,7 @@ partial interface MLGraphBuilder {
 };
 
 partial interface MLGraphBuilder {
-  MLOperand tanh(MLOperand x);
+  MLOperand tanh(MLOperand input);
   MLActivation tanh();
 };
 
diff --git a/test/wpt/tests/interfaces/webrtc-encoded-transform.idl b/test/wpt/tests/interfaces/webrtc-encoded-transform.idl
index 6dd2ba3fffa..3b169b066dc 100644
--- a/test/wpt/tests/interfaces/webrtc-encoded-transform.idl
+++ b/test/wpt/tests/interfaces/webrtc-encoded-transform.idl
@@ -74,14 +74,15 @@ dictionary RTCEncodedVideoFrameMetadata {
     octet payloadType;
     sequence<unsigned long> contributingSources;
     long long timestamp;    // microseconds
+    unsigned long rtpTimestamp;
+    DOMString mimeType;
 };
 
 // New interfaces to define encoded video and audio frames. Will eventually
 // re-use or extend the equivalent defined in WebCodecs.
-[Exposed=(Window,DedicatedWorker)]
+[Exposed=(Window,DedicatedWorker), Serializable]
 interface RTCEncodedVideoFrame {
     readonly attribute RTCEncodedVideoFrameType type;
-    readonly attribute unsigned long timestamp;
     attribute ArrayBuffer data;
     RTCEncodedVideoFrameMetadata getMetadata();
 };
@@ -91,11 +92,12 @@ dictionary RTCEncodedAudioFrameMetadata {
     octet payloadType;
     sequence<unsigned long> contributingSources;
     short sequenceNumber;
+    unsigned long rtpTimestamp;
+    DOMString mimeType;
 };
 
-[Exposed=(Window,DedicatedWorker)]
+[Exposed=(Window,DedicatedWorker), Serializable]
 interface RTCEncodedAudioFrame {
-    readonly attribute unsigned long timestamp;
     attribute ArrayBuffer data;
     RTCEncodedAudioFrameMetadata getMetadata();
 };
diff --git a/test/wpt/tests/interfaces/webrtc-stats.idl b/test/wpt/tests/interfaces/webrtc-stats.idl
index b398c73e3f4..8e65578b6ee 100644
--- a/test/wpt/tests/interfaces/webrtc-stats.idl
+++ b/test/wpt/tests/interfaces/webrtc-stats.idl
@@ -44,7 +44,6 @@ dictionary RTCReceivedRtpStreamStats : RTCRtpStreamStats {
 
 dictionary RTCInboundRtpStreamStats : RTCReceivedRtpStreamStats {
  required DOMString   trackIdentifier;
- required DOMString   kind;
  DOMString            mid;
  DOMString            remoteId;
  unsigned long        framesDecoded;
@@ -65,6 +64,7 @@ dictionary RTCInboundRtpStreamStats : RTCReceivedRtpStreamStats {
  DOMHighResTimeStamp  lastPacketReceivedTimestamp;
  unsigned long long   headerBytesReceived;
  unsigned long long   packetsDiscarded;
+ unsigned long long   fecBytesReceived;
  unsigned long long   fecPacketsReceived;
  unsigned long long   fecPacketsDiscarded;
  unsigned long long   bytesReceived;
@@ -94,6 +94,8 @@ dictionary RTCInboundRtpStreamStats : RTCReceivedRtpStreamStats {
  double               totalAssemblyTime;
  unsigned long long   retransmittedPacketsReceived;
  unsigned long long   retransmittedBytesReceived;
+ unsigned long        rtxSsrc;
+ unsigned long        fecSsrc;
 };
 
 dictionary RTCRemoteInboundRtpStreamStats : RTCReceivedRtpStreamStats {
@@ -117,6 +119,7 @@ dictionary RTCOutboundRtpStreamStats : RTCSentRtpStreamStats {
              unsigned long long   headerBytesSent;
              unsigned long long   retransmittedPacketsSent;
              unsigned long long   retransmittedBytesSent;
+             unsigned long        rtxSsrc;
              double               targetBitrate;
              unsigned long long   totalEncodedBytesTarget;
              unsigned long        frameWidth;
diff --git a/test/wpt/tests/interfaces/webrtc.idl b/test/wpt/tests/interfaces/webrtc.idl
index 4c31d3be67a..e571abb527f 100644
--- a/test/wpt/tests/interfaces/webrtc.idl
+++ b/test/wpt/tests/interfaces/webrtc.idl
@@ -289,7 +289,8 @@ interface RTCRtpSender {
   readonly attribute MediaStreamTrack? track;
   readonly attribute RTCDtlsTransport? transport;
   static RTCRtpCapabilities? getCapabilities(DOMString kind);
-  Promise<undefined> setParameters(RTCRtpSendParameters parameters);
+  Promise<undefined> setParameters(RTCRtpSendParameters parameters,
+      optional RTCSetParameterOptions setParameterOptions = {});
   RTCRtpSendParameters getParameters();
   Promise<undefined> replaceTrack(MediaStreamTrack? withTrack);
   undefined setStreams(MediaStream... streams);
@@ -355,6 +356,9 @@ dictionary RTCRtpHeaderExtensionCapability {
   required DOMString uri;
 };
 
+dictionary RTCSetParameterOptions {
+};
+
 [Exposed=Window]
 interface RTCRtpReceiver {
   readonly attribute MediaStreamTrack track;
diff --git a/test/wpt/tests/interfaces/webtransport.idl b/test/wpt/tests/interfaces/webtransport.idl
index a9f514e2366..86178a4906b 100644
--- a/test/wpt/tests/interfaces/webtransport.idl
+++ b/test/wpt/tests/interfaces/webtransport.idl
@@ -9,8 +9,8 @@ interface WebTransportDatagramDuplexStream {
   readonly attribute WritableStream writable;
 
   readonly attribute unsigned long maxDatagramSize;
-  attribute unrestricted double incomingMaxAge;
-  attribute unrestricted double outgoingMaxAge;
+  attribute unrestricted double? incomingMaxAge;
+  attribute unrestricted double? outgoingMaxAge;
   attribute unrestricted double incomingHighWaterMark;
   attribute unrestricted double outgoingHighWaterMark;
 };
@@ -19,7 +19,7 @@ interface WebTransportDatagramDuplexStream {
 interface WebTransport {
   constructor(USVString url, optional WebTransportOptions options = {});
 
-  Promise<WebTransportStats> getStats();
+  Promise<WebTransportConnectionStats> getStats();
   readonly attribute Promise<undefined> ready;
   readonly attribute WebTransportReliabilityMode reliability;
   readonly attribute WebTransportCongestionControl congestionControl;
@@ -38,6 +38,7 @@ interface WebTransport {
       optional WebTransportSendStreamOptions options = {});
   /* a ReadableStream of WebTransportReceiveStream objects */
   readonly attribute ReadableStream incomingUnidirectionalStreams;
+  WebTransportSendGroup createSendGroup();
 };
 
 enum WebTransportReliabilityMode {
@@ -70,16 +71,16 @@ dictionary WebTransportCloseInfo {
 };
 
 dictionary WebTransportSendStreamOptions {
-  long long? sendOrder = null;
+  WebTransportSendGroup? sendGroup = null;
+  long long sendOrder = 0;
+  boolean waitUntilAvailable = false;
 };
 
-dictionary WebTransportStats {
-  DOMHighResTimeStamp timestamp;
+dictionary WebTransportConnectionStats {
   unsigned long long bytesSent;
   unsigned long long packetsSent;
+  unsigned long long bytesLost;
   unsigned long long packetsLost;
-  unsigned long numOutgoingStreamsCreated;
-  unsigned long numIncomingStreamsCreated;
   unsigned long long bytesReceived;
   unsigned long long packetsReceived;
   DOMHighResTimeStamp smoothedRtt;
@@ -90,7 +91,6 @@ dictionary WebTransportStats {
 };
 
 dictionary WebTransportDatagramStats {
-  DOMHighResTimeStamp timestamp;
   unsigned long long expiredOutgoing;
   unsigned long long droppedIncoming;
   unsigned long long lostOutgoing;
@@ -98,24 +98,28 @@ dictionary WebTransportDatagramStats {
 
 [Exposed=(Window,Worker), SecureContext, Transferable]
 interface WebTransportSendStream : WritableStream {
-  attribute long long? sendOrder;
+  attribute WebTransportSendGroup? sendGroup;
+  attribute long long sendOrder;
   Promise<WebTransportSendStreamStats> getStats();
 };
 
 dictionary WebTransportSendStreamStats {
-  DOMHighResTimeStamp timestamp;
   unsigned long long bytesWritten;
   unsigned long long bytesSent;
   unsigned long long bytesAcknowledged;
 };
 
+[Exposed=(Window,Worker), SecureContext]
+interface WebTransportSendGroup {
+  Promise<WebTransportSendStreamStats> getStats();
+};
+
 [Exposed=(Window,Worker), SecureContext, Transferable]
 interface WebTransportReceiveStream : ReadableStream {
   Promise<WebTransportReceiveStreamStats> getStats();
 };
 
 dictionary WebTransportReceiveStreamStats {
-  DOMHighResTimeStamp timestamp;
   unsigned long long bytesReceived;
   unsigned long long bytesRead;
 };
diff --git a/test/wpt/tests/interfaces/webusb.idl b/test/wpt/tests/interfaces/webusb.idl
index fb0a71f307d..3b362d2351d 100644
--- a/test/wpt/tests/interfaces/webusb.idl
+++ b/test/wpt/tests/interfaces/webusb.idl
@@ -14,6 +14,7 @@ dictionary USBDeviceFilter {
 
 dictionary USBDeviceRequestOptions {
   required sequence<USBDeviceFilter> filters;
+  sequence<USBDeviceFilter> exclusionFilters = [];
 };
 
 [Exposed=(Worker,Window), SecureContext]
@@ -229,8 +230,16 @@ interface USBEndpoint {
   readonly attribute unsigned long packetSize;
 };
 
+// USBBlocklistEntry is never exposed.
+dictionary USBBlocklistEntry {
+  required unsigned short idVendor;
+  required unsigned short idProduct;
+  required unsigned short bcdDevice;
+};
+
 dictionary USBPermissionDescriptor : PermissionDescriptor {
   sequence<USBDeviceFilter> filters;
+  sequence<USBDeviceFilter> exclusionFilters;
 };
 
 dictionary AllowedUSBDevice {
diff --git a/test/wpt/tests/interfaces/webxr-plane-detection.idl b/test/wpt/tests/interfaces/webxr-plane-detection.idl
new file mode 100644
index 00000000000..037e9e251c7
--- /dev/null
+++ b/test/wpt/tests/interfaces/webxr-plane-detection.idl
@@ -0,0 +1,32 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content was automatically extracted by Reffy into webref
+// (https://github.com/w3c/webref)
+// Source: WebXR Plane Detection Module (https://immersive-web.github.io/real-world-geometry/plane-detection.html)
+
+enum XRPlaneOrientation {
+    "horizontal",
+    "vertical"
+};
+
+[Exposed=Window]
+interface XRPlane {
+    [SameObject] readonly attribute XRSpace planeSpace;
+
+    readonly attribute FrozenArray<DOMPointReadOnly> polygon;
+    readonly attribute XRPlaneOrientation? orientation;
+    readonly attribute DOMHighResTimeStamp lastChangedTime;
+    readonly attribute DOMString? semanticLabel;
+};
+
+[Exposed=Window]
+interface XRPlaneSet {
+  readonly setlike<XRPlane>;
+};
+
+partial interface XRFrame {
+  readonly attribute XRPlaneSet detectedPlanes;
+};
+
+partial interface XRSession {
+  Promise<undefined> initiateRoomCapture();
+};
diff --git a/test/wpt/tests/interfaces/webxr.idl b/test/wpt/tests/interfaces/webxr.idl
index de2b04691b3..3b7f8a55b7c 100644
--- a/test/wpt/tests/interfaces/webxr.idl
+++ b/test/wpt/tests/interfaces/webxr.idl
@@ -167,7 +167,8 @@ enum XRHandedness {
 enum XRTargetRayMode {
   "gaze",
   "tracked-pointer",
-  "screen"
+  "screen",
+  "transient-pointer"
 };
 
 [SecureContext, Exposed=Window]
diff --git a/test/wpt/tests/lint.ignore b/test/wpt/tests/lint.ignore
index 489c717cd6a..c82f8027f69 100644
--- a/test/wpt/tests/lint.ignore
+++ b/test/wpt/tests/lint.ignore
@@ -20,6 +20,7 @@ TRAILING WHITESPACE: html/syntax/xmldecl/support/no-version-or-space-or-trailing
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.adts
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.pdf
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.jpg
+TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.jxl
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.png
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.gif
 TRAILING WHITESPACE, INDENT TABS, CR AT EOL: *.wav
@@ -89,7 +90,7 @@ CR AT EOL: html/syntax/charset/after-head-after-1kb-crlf.html
 CR AT EOL: html/syntax/charset/after-head-in-1kb-crlf.html
 
 # Intentional use of tabs
-INDENT TABS: html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
+INDENT TABS: html/canvas/element/canvas-host/2d.canvas.host.size.attributes.parse.whitespace.html
 INDENT TABS: webvtt/parsing/file-parsing/tests/support/header-tab.vtt
 INDENT TABS: webvtt/parsing/file-parsing/tests/support/whitespace-chars.vtt
 
@@ -157,6 +158,7 @@ SET TIMEOUT: css/selectors/invalidation/dir-pseudo-class-in-has.html
 SET TIMEOUT: css/selectors/invalidation/lang-pseudo-class-in-has-document-element.html
 SET TIMEOUT: css/selectors/invalidation/lang-pseudo-class-in-has-xhtml.xhtml
 SET TIMEOUT: css/selectors/invalidation/lang-pseudo-class-in-has.html
+SET TIMEOUT: custom-elements/scoped-registry/scoped-registry-define-upgrade-criteria.tentative.html
 SET TIMEOUT: encrypted-media/polyfill/chrome-polyfill.js
 SET TIMEOUT: encrypted-media/polyfill/clearkey-polyfill.js
 SET TIMEOUT: encrypted-media/scripts/playback-temporary-events.js
@@ -211,9 +213,39 @@ SET TIMEOUT: navigation-timing/*
 SET TIMEOUT: old-tests/submission/Microsoft/history/history_000.htm
 SET TIMEOUT: paint-timing/resources/subframe-painting.html
 SET TIMEOUT: performance-timeline/resources/navigation-id-detached-frame-page.html
+SET TIMEOUT: png/apng/acTL-plays-one.html
+SET TIMEOUT: png/apng/acTL-plays-two.html
+SET TIMEOUT: png/apng/fdAT-split-basic.html
+SET TIMEOUT: png/apng/fdAT-split-zero-length.html
+SET TIMEOUT: png/apng/fcTL-acTL-ordering.html
+SET TIMEOUT: png/apng/fcTL-blend-over-repeatedly.html
+SET TIMEOUT: png/apng/fcTL-blend-over-solid.html
+SET TIMEOUT: png/apng/fcTL-blend-source-nearly-transparent.html
+SET TIMEOUT: png/apng/fcTL-blend-source-solid.html
+SET TIMEOUT: png/apng/fcTL-blend-source-transparent.html
+SET TIMEOUT: png/apng/fcTL-dispose-background-final.html
+SET TIMEOUT: png/apng/fcTL-dispose-background.html
+SET TIMEOUT: png/apng/fcTL-dispose-before-region-background.html
+SET TIMEOUT: png/apng/fcTL-dispose-in-region-background.html
+SET TIMEOUT: png/apng/fcTL-dispose-in-region-none.html
+SET TIMEOUT: png/apng/fcTL-dispose-in-region-previous.html
+SET TIMEOUT: png/apng/fcTL-dispose-none.html
+SET TIMEOUT: png/apng/fcTL-dispose-previous-final.html
+SET TIMEOUT: png/apng/fcTL-dispose-previous-first.html
+SET TIMEOUT: png/apng/fcTL-dispose-previous.html
+SET TIMEOUT: png/apng/fdAT-16bit.html
+SET TIMEOUT: png/apng/fdAT-1bit-PLTE-tRNS.html
+SET TIMEOUT: png/apng/fdAT-1bit-PLTE.html
+SET TIMEOUT: png/apng/fdAT-2bit-PLTE-tRNS.html
+SET TIMEOUT: png/apng/fdAT-8bit-gray-alpha.html
+SET TIMEOUT: png/apng/fdAT-8bit-gray.html
+SET TIMEOUT: png/apng/first-frame-IDAT.html
+SET TIMEOUT: png/apng/first-frame-not-IDAT.html
+SET TIMEOUT: png/apng/tester-check.html
 SET TIMEOUT: portals/resources/portals-adopt-predecessor-portal.html
 SET TIMEOUT: preload/single-download-preload.html
 SET TIMEOUT: preload/resources/slow-exec.js
+SET TIMEOUT: print/crashtests/reload-crash.html
 SET TIMEOUT: resize-observer/resources/iframe.html
 SET TIMEOUT: resource-timing/resources/nested-contexts.js
 SET TIMEOUT: reporting/resources/first-csp-report.https.sub.html
@@ -241,8 +273,8 @@ SET TIMEOUT: service-workers/service-worker/resources/resource-timing-worker.js
 SET TIMEOUT: shadow-dom/Document-prototype-currentScript.html
 SET TIMEOUT: shadow-dom/scroll-to-the-fragment-in-shadow-tree.html
 SET TIMEOUT: shadow-dom/slotchange-event.html
-SET TIMEOUT: trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html
-SET TIMEOUT: trusted-types/DOMWindowTimers-setTimeout-setInterval.tentative.html
+SET TIMEOUT: trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.html
+SET TIMEOUT: trusted-types/DOMWindowTimers-setTimeout-setInterval.html
 SET TIMEOUT: pending-beacon/resources/pending_beacon-helper.js
 SET TIMEOUT: user-timing/*
 SET TIMEOUT: web-animations/crashtests/reparent-animating-element-002.html
@@ -262,6 +294,7 @@ SET TIMEOUT: xhr/resources/init.htm
 SET TIMEOUT: xhr/resources/xmlhttprequest-timeout.js
 SET TIMEOUT: fenced-frame/resolve-to-config-promise.https.html
 SET TIMEOUT: credential-management/support/fedcm-iframe.html
+SET TIMEOUT: credential-management/support/fedcm/disconnect-iframe.html
 
 # generate_tests implementation and sample usage
 GENERATE_TESTS: resources/test/tests/functional/generate-callback.html
@@ -308,8 +341,6 @@ GENERATE_TESTS: dom/ranges/Range-selectNode.html
 GENERATE_TESTS: dom/ranges/Range-set.html
 GENERATE_TESTS: dom/traversal/TreeWalker.html
 GENERATE_TESTS: domparsing/createContextualFragment.html
-GENERATE_TESTS: domxpath/001.html
-GENERATE_TESTS: domxpath/002.html
 GENERATE_TESTS: mediacapture-image/MediaStreamTrack-applyConstraints-reject.https.html
 GENERATE_TESTS: mediacapture-image/MediaStreamTrack-getCapabilities.https.html
 GENERATE_TESTS: mediacapture-image/MediaStreamTrack-getConstraints.https.html
@@ -328,6 +359,7 @@ GENERATE_TESTS: mediacapture-fromelement/creation.html
 GENERATE_TESTS: mediacapture-fromelement/ended.html
 GENERATE_TESTS: html/canvas/offscreen/manual/filter/offscreencanvas.filter.html
 GENERATE_TESTS: pointerevents/pointerevent_constructor.html
+GENERATE_TESTS: pointerevents/pointerevent_constructor.https.html
 GENERATE_TESTS: pointerevents/extension/pointerevent_constructor.html
 GENERATE_TESTS: selection/collapse.js
 GENERATE_TESTS: shadow-dom/leaktests/html-collection.html
@@ -371,6 +403,7 @@ SET TIMEOUT: speculation-rules/prerender/resources/media-autoplay-attribute.html
 SET TIMEOUT: speculation-rules/prerender/resources/media-play.html
 SET TIMEOUT: html/browsers/browsing-the-web/back-forward-cache/timers.html
 SET TIMEOUT: dom/abort/crashtests/timeout-close.html
+SET TIMEOUT: storage-access-api/storage-access-beyond-cookies.locks.tentative.sub.https.window.js
 
 # setTimeout use in reftests
 SET TIMEOUT: acid/acid3/test.html
@@ -436,13 +469,6 @@ TRAILING WHITESPACE: css/css-fonts/support/fonts/gsubtest-lookup3.ufo/features.f
 
 SET TIMEOUT: css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform-and-transition.html
 SET TIMEOUT: css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform-and-transition.html
-SET TIMEOUT: css/css-backgrounds/color-mix-currentcolor-background-repaint-parent.html
-SET TIMEOUT: css/css-backgrounds/color-mix-currentcolor-background-repaint.html
-SET TIMEOUT: css/css-backgrounds/color-mix-currentcolor-border-repaint-parent.html
-SET TIMEOUT: css/css-backgrounds/color-mix-currentcolor-border-repaint.html
-SET TIMEOUT: css/css-backgrounds/color-mix-currentcolor-outline-repaint-parent.html
-SET TIMEOUT: css/css-backgrounds/color-mix-currentcolor-outline-repaint.html
-SET TIMEOUT: css/css-backgrounds/currentcolor-border-repaint-parent.html
 SET TIMEOUT: css/css-transitions/events-007.html
 SET TIMEOUT: css/css-transitions/support/generalParallelTest.js
 SET TIMEOUT: css/css-transitions/support/runParallelAsyncHarness.js
@@ -621,6 +647,7 @@ AHEM SYSTEM FONT: css/css-fonts/font-size-adjust-metrics-override.html
 AHEM SYSTEM FONT: css/css-fonts/font-size-adjust-metrics-override-ref.html
 AHEM SYSTEM FONT: css/css-fonts/line-gap-override.html
 AHEM SYSTEM FONT: css/css-fonts/parsing/font-size-adjust-computed.html
+AHEM SYSTEM FONT: css/css-fonts/size-adjust-unicode-range-system-fallback.html
 AHEM SYSTEM FONT: html/dom/render-blocking/remove-attr-unblocks-rendering.optional.html
 AHEM SYSTEM FONT: html/dom/render-blocking/remove-element-unblocks-rendering.optional.html
 
@@ -705,3 +732,17 @@ SET TIMEOUT: editing/crashtests/outdent-across-svg-boundary.html
 SET TIMEOUT: editing/crashtests/textarea-will-be-blurred-by-focus-event-listener.html
 SET TIMEOUT: mathml/crashtests/mozilla/*
 PARSE-FAILED: mathml/crashtests/mozilla/289180-1.xml
+
+# Invalid HTML syntax /> on non-void elements
+HTML INVALID SYNTAX: acid/*
+HTML INVALID SYNTAX: conformance-checkers/*
+HTML INVALID SYNTAX: css/css-scoping/shadow-cascade-order-001.html
+HTML INVALID SYNTAX: dom/nodes/Document-createElement-namespace.html
+HTML INVALID SYNTAX: dom/nodes/Node-lookupNamespaceURI.html
+HTML INVALID SYNTAX: dom/nodes/Node-normalize.html
+HTML INVALID SYNTAX: domparsing/DOMParser-parseFromString-xml-doctype.html
+HTML INVALID SYNTAX: domparsing/DOMParser-parseFromString-xml-parsererror.html
+HTML INVALID SYNTAX: domparsing/XMLSerializer-serializeToString.html
+HTML INVALID SYNTAX: html/canvas/element/manual/unclosed-canvas-4.htm
+HTML INVALID SYNTAX: quirks/percentage-height-calculation.html
+HTML INVALID SYNTAX: trusted-types/TrustedTypePolicyFactory-getAttributeType-namespace.html
diff --git a/test/wpt/tests/resources/check-layout-th.js b/test/wpt/tests/resources/check-layout-th.js
index f14ca3246b8..54ddb35f311 100644
--- a/test/wpt/tests/resources/check-layout-th.js
+++ b/test/wpt/tests/resources/check-layout-th.js
@@ -218,6 +218,7 @@ window.checkLayout = function(selectorList, callDone = true)
     nodes = Array.prototype.slice.call(nodes);
     var checkedLayout = false;
     Array.prototype.forEach.call(nodes, function(node) {
+        const title = node.title == '' ? '' : `: ${node.title}`;
         test(function(t) {
             var container = node.parentNode.className == 'container' ? node.parentNode : node;
             var prefix =
@@ -240,7 +241,7 @@ window.checkLayout = function(selectorList, callDone = true)
               }
                 checkedLayout |= !passed;
             }
-        }, selectorList + ' ' + String(++testNumber));
+        }, `${selectorList} ${++testNumber}${title}`);
     });
     if (!checkedLayout) {
         console.error("No valid data-* attributes found in selector list : " + selectorList);
diff --git a/test/wpt/tests/resources/chromium/fake-serial.js b/test/wpt/tests/resources/chromium/fake-serial.js
index e1e4d57e3ee..29c8168fb59 100644
--- a/test/wpt/tests/resources/chromium/fake-serial.js
+++ b/test/wpt/tests/resources/chromium/fake-serial.js
@@ -239,8 +239,10 @@ class FakeSerialPort {
         this.writable_ = undefined;
         break;
       case SerialPortFlushMode.kTransmit:
-        this.reader_.cancel();
-        this.reader_ = undefined;
+        if (this.reader_) {
+          this.reader_.cancel();
+          this.reader_ = undefined;
+        }
         this.readable_ = undefined;
         break;
     }
diff --git a/test/wpt/tests/resources/chromium/generic_sensor_mocks.js b/test/wpt/tests/resources/chromium/generic_sensor_mocks.js
index 98a29c2104f..baf57c7c85a 100644
--- a/test/wpt/tests/resources/chromium/generic_sensor_mocks.js
+++ b/test/wpt/tests/resources/chromium/generic_sensor_mocks.js
@@ -1,5 +1,6 @@
 import {ReportingMode, Sensor, SensorClientRemote, SensorReceiver, SensorRemote, SensorType} from '/gen/services/device/public/mojom/sensor.mojom.m.js';
-import {SensorCreationResult, SensorInitParams_READ_BUFFER_SIZE_FOR_TESTS, SensorProvider, SensorProviderReceiver} from '/gen/services/device/public/mojom/sensor_provider.mojom.m.js';
+import {SensorCreationResult, SensorInitParams_READ_BUFFER_SIZE_FOR_TESTS} from '/gen/services/device/public/mojom/sensor_provider.mojom.m.js';
+import {WebSensorProvider, WebSensorProviderReceiver} from '/gen/third_party/blink/public/mojom/sensor/web_sensor_provider.mojom.m.js';
 
 // A "sliding window" that iterates over |data| and returns one item at a
 // time, advancing and wrapping around as needed. |data| must be an array of
@@ -273,6 +274,9 @@ self.GenericSensorTest = (() => {
         window.clearInterval(this.sensorReadingTimerId_);
         this.sensorReadingTimerId_ = null;
       }
+      this.buffer_.fill(0);
+      this.lastRawReading_ = null;
+      this.lastRoundedReading_ = null;
     }
 
     getSamplingFrequency() {
@@ -287,8 +291,8 @@ self.GenericSensorTest = (() => {
     }
   }
 
-  // Class that mocks SensorProvider interface defined in
-  // https://cs.chromium.org/chromium/src/services/device/public/mojom/sensor_provider.mojom
+  // Class that mocks the WebSensorProvider interface defined in
+  // https://cs.chromium.org/chromium/src/third_party/blink/public/mojom/sensor/web_sensor_provider.mojom
   class MockSensorProvider {
     constructor() {
       this.readingSizeInBytes_ =
@@ -334,10 +338,10 @@ self.GenericSensorTest = (() => {
             SensorType.RELATIVE_ORIENTATION_EULER_ANGLES],
         ['ProximitySensor', SensorType.PROXIMITY]
       ]);
-      this.receiver_ = new SensorProviderReceiver(this);
+      this.receiver_ = new WebSensorProviderReceiver(this);
 
       this.interceptor_ =
-          new MojoInterfaceInterceptor(SensorProvider.$interfaceName);
+        new MojoInterfaceInterceptor(WebSensorProvider.$interfaceName);
       this.interceptor_.oninterfacerequest = e => {
         this.bindToPipe(e.handle);
       };
diff --git a/test/wpt/tests/resources/chromium/webxr-test.js b/test/wpt/tests/resources/chromium/webxr-test.js
index c5eb1bd14b8..aba3447982b 100644
--- a/test/wpt/tests/resources/chromium/webxr-test.js
+++ b/test/wpt/tests/resources/chromium/webxr-test.js
@@ -196,7 +196,7 @@ class MockVRService {
 
       // If there were no successful results, returns a null session.
       return {
-        result: {failureReason: vrMojom.RequestSessionError.NO_RUNTIME_FOUND}
+        result: {failureReason: xrSessionMojom.RequestSessionError.NO_RUNTIME_FOUND}
       };
     });
   }
@@ -1212,11 +1212,14 @@ class MockRuntime {
             deviceConfig: {
               defaultFramebufferScale: this.defaultFramebufferScale_,
               supportsViewportScaling: true,
-              depthConfiguration:
-                enabled_features.includes(xrSessionMojom.XRSessionFeature.DEPTH) ? {
-                  depthUsage: vrMojom.XRDepthUsage.kCPUOptimized,
-                  depthDataFormat: vrMojom.XRDepthDataFormat.kLuminanceAlpha,
-                } : null,
+              depthConfiguration: enabled_features.includes(
+                                      xrSessionMojom.XRSessionFeature.DEPTH) ?
+                  {
+                    depthUsage: xrSessionMojom.XRDepthUsage.kCPUOptimized,
+                    depthDataFormat:
+                        xrSessionMojom.XRDepthDataFormat.kLuminanceAlpha,
+                  } :
+                  null,
               views: this._getDefaultViews(),
             },
             enviromentBlendMode: this.enviromentBlendMode_,
@@ -1234,8 +1237,10 @@ class MockRuntime {
 
     if (options.requiredFeatures.includes(xrSessionMojom.XRSessionFeature.DEPTH)
     || options.optionalFeatures.includes(xrSessionMojom.XRSessionFeature.DEPTH)) {
-      result &= options.depthOptions.usagePreferences.includes(vrMojom.XRDepthUsage.kCPUOptimized);
-      result &= options.depthOptions.dataFormatPreferences.includes(vrMojom.XRDepthDataFormat.kLuminanceAlpha);
+      result &= options.depthOptions.usagePreferences.includes(
+          xrSessionMojom.XRDepthUsage.kCPUOptimized);
+      result &= options.depthOptions.dataFormatPreferences.includes(
+          xrSessionMojom.XRDepthDataFormat.kLuminanceAlpha);
     }
 
     return Promise.resolve({
diff --git a/test/wpt/tests/resources/test/tests/functional/step_wait.html b/test/wpt/tests/resources/test/tests/functional/step_wait.html
index ae3442c7595..8235d9d48a1 100644
--- a/test/wpt/tests/resources/test/tests/functional/step_wait.html
+++ b/test/wpt/tests/resources/test/tests/functional/step_wait.html
@@ -25,6 +25,22 @@
 promise_test(async t => {
   await t.step_wait(); // Throws
 }, "step_wait() takes an argument");
+
+promise_test(async t => {
+  function wait(ms) {
+    return new Promise(resolve => step_timeout(resolve, ms));
+  }
+  let x = 1;
+  step_timeout(() => {
+    ++x;
+  }, 100);
+
+  await t.step_wait(async () => {
+    await wait(1);
+    return x === 2;
+  });
+  assert_equals(x, 2);
+}, "async step_wait()");
 </script>
 <script type="text/json" id="expected">
 {
@@ -46,6 +62,12 @@
       "message": "cond is not a function",
       "properties": {},
       "status_string": "FAIL"
+    },
+    {
+      "name": "async step_wait()",
+      "message": null,
+      "properties": {},
+      "status_string": "PASS"
     }
   ],
   "type": "complete",
diff --git a/test/wpt/tests/resources/test/tests/unit/late-test.html b/test/wpt/tests/resources/test/tests/unit/late-test.html
index 693d7e3c818..c9f8ec61fe5 100644
--- a/test/wpt/tests/resources/test/tests/unit/late-test.html
+++ b/test/wpt/tests/resources/test/tests/unit/late-test.html
@@ -10,11 +10,12 @@
 <p>This test simulates an automated test running scenario, where the test
 results emitted by testharness.js may be interpreted after some delay. It is
 intended to demonstrate that in such cases, any additional tests which are
-executed during that delay are <em>not</em> included in the dataset.</p>
+executed during that delay are included in the dataset.</p>
 
-<p>Although these "late" tests are likely an indication of a mistake in test
-design, they cannot be detected deterministically, so in the interest of
-stability, they should be silently tolerated.</p>
+<p>Although these "late tests" are likely an indication of a mistake in test
+design, they are also recorded. Previously, "late tests" were ignored.
+This test changed to assert "late tests" were no longer ignored after
+https://github.com/web-platform-tests/wpt/pull/38806 was introduced.</p>
 <script>
 async_test(function(t) {
     var source = [
@@ -27,7 +28,7 @@
         "test(function() {}, 'acceptable test');",
         "onload = function() {",
         "  done();",
-        "  test(function() {}, 'this test is late and should be ignored');",
+        "  test(function() {}, 'test registered in onload handler');",
         "};",
         "</" + "script>"
     ].join("\n");
@@ -37,8 +38,9 @@
     window.childReady = t.step_func(function(childWindow) {
         childWindow.add_completion_callback(t.step_func(function(tests, status) {
             t.step_timeout(t.step_func(function() {
-                assert_equals(tests.length, 1);
+                assert_equals(tests.length, 2);
                 assert_equals(tests[0].name, "acceptable test");
+                assert_equals(tests[1].name, "test registered in onload handler");
                 assert_equals(status.status, status.OK);
                 t.done();
             }), 0);
diff --git a/test/wpt/tests/resources/testdriver.js b/test/wpt/tests/resources/testdriver.js
index a23d6eaf4cf..70c799167f9 100644
--- a/test/wpt/tests/resources/testdriver.js
+++ b/test/wpt/tests/resources/testdriver.js
@@ -262,7 +262,9 @@
          * occurs.
          *
          * If ``element`` is from a different browsing context, the
-         * command will be run in that context.
+         * command will be run in that context. The test must not depend
+         * on the ``window.name`` property being unset on the target
+         * window.
          *
          * To send special keys, send the respective key's codepoint,
          * as defined by `WebDriver
@@ -417,8 +419,9 @@
         /**
          * Sets the state of a permission
          *
-         * This function simulates a user setting a permission into a
-         * particular state.
+         * This function causes permission requests and queries for the status
+         * of a certain permission type (e.g. "push", or "background-fetch") to
+         * always return ``state``.
          *
          * Matches the `Set Permission
          * <https://w3c.github.io/permissions/#set-permission-command>`_
@@ -430,8 +433,10 @@
          *
          * @param {PermissionDescriptor} descriptor - a `PermissionDescriptor
          *                              <https://w3c.github.io/permissions/#dom-permissiondescriptor>`_
-         *                              dictionary.
-         * @param {String} state - the state of the permission
+         *                              or derived object.
+         * @param {PermissionState} state - a `PermissionState
+         *                          <https://w3c.github.io/permissions/#dom-permissionstate>`_
+         *                          value.
          * @param {WindowProxy} context - Browsing context in which
          *                                to run the call, or null for the current
          *                                browsing context.
@@ -642,7 +647,7 @@
          *
          * This function places `Secure Payment
          * Confirmation <https://w3c.github.io/secure-payment-confirmation>`_ into
-         * an automated 'autoaccept' or 'autoreject' mode, to allow testing
+         * an automated 'autoAccept' or 'autoReject' mode, to allow testing
          * without user interaction with the transaction UX prompt.
          *
          * Matches the `Set SPC Transaction Mode
@@ -662,8 +667,8 @@
          * @param {String} mode - The `transaction mode
          *                        <https://w3c.github.io/secure-payment-confirmation/#enumdef-transactionautomationmode>`_
          *                        to set. Must be one of "``none``",
-         *                        "``autoaccept``", or
-         *                        "``autoreject``".
+         *                        "``autoAccept``", or
+         *                        "``autoReject``".
          * @param {WindowProxy} context - Browsing context in which
          *                                to run the call, or null for the current
          *                                browsing context.
@@ -675,6 +680,42 @@
           return window.test_driver_internal.set_spc_transaction_mode(mode, context);
         },
 
+        /**
+         * Sets the current registration automation mode for Register Protocol Handlers.
+         *
+         * This function places `Register Protocol Handlers
+         * <https://html.spec.whatwg.org/multipage/system-state.html#custom-handlers>`_ into
+         * an automated 'autoAccept' or 'autoReject' mode, to allow testing
+         * without user interaction with the transaction UX prompt.
+         *
+         * Matches the `Set Register Protocol Handler Mode
+         * <https://html.spec.whatwg.org/multipage/system-state.html#set-rph-registration-mode>`_
+         * WebDriver command.
+         *
+         * @example
+         * await test_driver.set_rph_registration_mode("autoAccept");
+         * test.add_cleanup(() => {
+         *   return test_driver.set_rph_registration_mode("none");
+         * });
+         *
+         * navigator.registerProtocolHandler('web+soup', 'soup?url=%s');
+         *
+         * @param {String} mode - The `registration mode
+         *                        <https://html.spec.whatwg.org/multipage/system-state.html#registerprotocolhandler()-automation-mode>`_
+         *                        to set. Must be one of "``none``",
+         *                        "``autoAccept``", or
+         *                        "``autoReject``".
+         * @param {WindowProxy} context - Browsing context in which
+         *                                to run the call, or null for the current
+         *                                browsing context.
+         *
+         * @returns {Promise} Fulfilled after the transaction mode has been set,
+         *                    or rejected if setting the mode fails.
+         */
+        set_rph_registration_mode: function(mode, context=null) {
+          return window.test_driver_internal.set_rph_registration_mode(mode, context);
+        },
+
         /**
          * Cancels the Federated Credential Management dialog
          *
@@ -693,6 +734,25 @@
             return window.test_driver_internal.cancel_fedcm_dialog(context);
         },
 
+        /**
+         * Clicks a button on the Federated Credential Management dialog
+         *
+         * Matches the `Click dialog button
+         * <https://fedidcg.github.io/FedCM/#webdriver-clickdialogbutton>`_
+         * WebDriver command.
+         *
+         * @param {String} dialog_button - String enum representing the dialog button to click.
+         * @param {WindowProxy} context - Browsing context in which
+         *                                to run the call, or null for the current
+         *                                browsing context.
+         *
+         * @returns {Promise} Fulfilled after the button is clicked,
+         *                    or rejected in case the WebDriver command errors
+         */
+        click_fedcm_dialog_button: function(dialog_button, context=null) {
+          return window.test_driver_internal.click_fedcm_dialog_button(dialog_button, context);
+        },
+
         /**
          * Selects an account from the Federated Credential Management dialog
          *
@@ -801,6 +861,149 @@
          */
         reset_fedcm_cooldown: function(context=null) {
           return window.test_driver_internal.reset_fedcm_cooldown(context);
+        },
+
+        /**
+         * Creates a virtual sensor for use with the Generic Sensors APIs.
+         *
+         * Matches the `Create Virtual Sensor
+         * <https://w3c.github.io/sensors/#create-virtual-sensor-command>`_
+         * WebDriver command.
+         *
+         * Once created, a virtual sensor is available to all navigables under
+         * the same top-level traversable (i.e. all frames in the same page,
+         * regardless of origin).
+         *
+         * @param {String} sensor_type - A `virtual sensor type
+         *                               <https://w3c.github.io/sensors/#virtual-sensor-metadata-virtual-sensor-type>`_
+         *                               such as "accelerometer".
+         * @param {Object} [sensor_params={}] - Optional parameters described
+         *                                     in `Create Virtual Sensor
+         *                                     <https://w3c.github.io/sensors/#create-virtual-sensor-command>`_.
+         * @param {WindowProxy} [context=null] - Browsing context in which to
+         *                                       run the call, or null for the
+         *                                       current browsing context.
+         *
+         * @returns {Promise} Fulfilled when virtual sensor is created.
+         *                    Rejected in case the WebDriver command errors out
+         *                    (including if a virtual sensor of the same type
+         *                    already exists).
+         */
+        create_virtual_sensor: function(sensor_type, sensor_params={}, context=null) {
+          return window.test_driver_internal.create_virtual_sensor(sensor_type, sensor_params, context);
+        },
+
+        /**
+         * Causes a virtual sensor to report a new reading to any connected
+         * platform sensor.
+         *
+         * Matches the `Update Virtual Sensor Reading
+         * <https://w3c.github.io/sensors/#update-virtual-sensor-reading-command>`_
+         * WebDriver command.
+         *
+         * Note: The ``Promise`` it returns may fulfill before or after a
+         * "reading" event is fired. When using
+         * :js:func:`EventWatcher.wait_for`, it is necessary to take this into
+         * account:
+         *
+         * Note: New values may also be discarded due to the checks in `update
+         * latest reading
+         * <https://w3c.github.io/sensors/#update-latest-reading>`_.
+         *
+         * @example
+         * // Avoid races between EventWatcher and update_virtual_sensor().
+         * // This assumes you are sure this reading will be processed (see
+         * // the example below otherwise).
+         * const reading = { x: 1, y: 2, z: 3 };
+         * await Promise.all([
+         *   test_driver.update_virtual_sensor('gyroscope', reading),
+         *   watcher.wait_for('reading')
+         * ]);
+         *
+         * @example
+         * // Do not wait forever if you are not sure the reading will be
+         * // processed.
+         * const readingPromise = watcher.wait_for('reading');
+         * const timeoutPromise = new Promise(resolve => {
+         *     t.step_timeout(() => resolve('TIMEOUT', 3000))
+         * });
+         *
+         * const reading = { x: 1, y: 2, z: 3 };
+         * await test_driver.update_virtual_sensor('gyroscope', 'reading');
+         *
+         * const value =
+         *     await Promise.race([timeoutPromise, readingPromise]);
+         * if (value !== 'TIMEOUT') {
+         *   // Do something. The "reading" event was fired.
+         * }
+         *
+         * @param {String} sensor_type - A `virtual sensor type
+         *                               <https://w3c.github.io/sensors/#virtual-sensor-metadata-virtual-sensor-type>`_
+         *                               such as "accelerometer".
+         * @param {Object} reading - An Object describing a reading in a format
+         *                           dependent on ``sensor_type`` (e.g. ``{x:
+         *                           1, y: 2, z: 3}`` or ``{ illuminance: 42
+         *                           }``).
+         * @param {WindowProxy} [context=null] - Browsing context in which to
+         *                                       run the call, or null for the
+         *                                       current browsing context.
+         *
+         * @returns {Promise} Fulfilled after the reading update reaches the
+         *                    virtual sensor. Rejected in case the WebDriver
+         *                    command errors out (including if a virtual sensor
+         *                    of the given type does not exist).
+         */
+        update_virtual_sensor: function(sensor_type, reading, context=null) {
+          return window.test_driver_internal.update_virtual_sensor(sensor_type, reading, context);
+        },
+
+        /**
+         * Triggers the removal of a virtual sensor if it exists.
+         *
+         * Matches the `Delete Virtual Sensor
+         * <https://w3c.github.io/sensors/#delete-virtual-sensor-command>`_
+         * WebDriver command.
+         *
+         * @param {String} sensor_type - A `virtual sensor type
+         *                               <https://w3c.github.io/sensors/#virtual-sensor-metadata-virtual-sensor-type>`_
+         *                               such as "accelerometer".
+         * @param {WindowProxy} [context=null] - Browsing context in which to
+         *                                       run the call, or null for the
+         *                                       current browsing context.
+         *
+         * @returns {Promise} Fulfilled after the virtual sensor has been
+         *                    removed or if a sensor of the given type does not
+         *                    exist. Rejected in case the WebDriver command
+         *                    errors out.
+
+         */
+        remove_virtual_sensor: function(sensor_type, context=null) {
+          return window.test_driver_internal.remove_virtual_sensor(sensor_type, context);
+        },
+
+        /**
+         * Returns information about a virtual sensor.
+         *
+         * Matches the `Get Virtual Sensor Information
+         * <https://w3c.github.io/sensors/#get-virtual-sensor-information-command>`_
+         * WebDriver command.
+         *
+         * @param {String} sensor_type - A `virtual sensor type
+         *                               <https://w3c.github.io/sensors/#virtual-sensor-metadata-virtual-sensor-type>`_
+         *                               such as "accelerometer".
+         * @param {WindowProxy} [context=null] - Browsing context in which to
+         *                                       run the call, or null for the
+         *                                       current browsing context.
+         *
+         * @returns {Promise} Fulfilled with an Object with the properties
+         *                    described in `Get Virtual Sensor Information
+         *                    <https://w3c.github.io/sensors/#get-virtual-sensor-information-command>`_.
+         *                    Rejected in case the WebDriver command errors out
+         *                    (including if a virtual sensor of the given type
+         *                    does not exist).
+         */
+        get_virtual_sensor_information: function(sensor_type, context=null) {
+            return window.test_driver_internal.get_virtual_sensor_information(sensor_type, context);
         }
     };
 
@@ -927,10 +1130,18 @@
             throw new Error("set_spc_transaction_mode() is not implemented by testdriver-vendor.js");
         },
 
+        set_rph_registration_mode: function(mode, context=null) {
+            return Promise.reject(new Error("unimplemented"));
+        },
+
         async cancel_fedcm_dialog(context=null) {
             throw new Error("cancel_fedcm_dialog() is not implemented by testdriver-vendor.js");
         },
 
+        async click_fedcm_dialog_button(dialog_button, context=null) {
+            throw new Error("click_fedcm_dialog_button() is not implemented by testdriver-vendor.js");
+        },
+
         async select_fedcm_account(account_index, context=null) {
             throw new Error("select_fedcm_account() is not implemented by testdriver-vendor.js");
         },
@@ -953,6 +1164,22 @@
 
         async reset_fedcm_cooldown(context=null) {
             throw new Error("reset_fedcm_cooldown() is not implemented by testdriver-vendor.js");
+        },
+
+        async create_virtual_sensor(sensor_type, sensor_params, context=null) {
+            throw new Error("create_virtual_sensor() is not implemented by testdriver-vendor.js");
+        },
+
+        async update_virtual_sensor(sensor_type, reading, context=null) {
+            throw new Error("update_virtual_sensor() is not implemented by testdriver-vendor.js");
+        },
+
+        async remove_virtual_sensor(sensor_type, context=null) {
+            throw new Error("remove_virtual_sensor() is not implemented by testdriver-vendor.js");
+        },
+
+        async get_virtual_sensor_information(sensor_type, context=null) {
+            throw new Error("get_virtual_sensor_information() is not implemented by testdriver-vendor.js");
         }
     };
 })();
diff --git a/test/wpt/tests/resources/testharness.js b/test/wpt/tests/resources/testharness.js
index 413993089be..bc7fb8961b9 100644
--- a/test/wpt/tests/resources/testharness.js
+++ b/test/wpt/tests/resources/testharness.js
@@ -91,7 +91,12 @@
         }
 
         on_event(window, 'load', function() {
+          setTimeout(() => {
             this_obj.all_loaded = true;
+            if (tests.all_done()) {
+              tests.complete();
+            }
+          },0);
         });
 
         on_event(window, 'message', function(event) {
@@ -1497,7 +1502,7 @@
     /**
      * Assert that ``actual`` is the same value as ``expected``.
      *
-     * For objects this compares by cobject identity; for primitives
+     * For objects this compares by object identity; for primitives
      * this distinguishes between 0 and -0, and has correct handling
      * of NaN.
      *
@@ -2729,8 +2734,9 @@
      * speed when the condition is quickly met.
      *
      * @param {Function} cond A function taking no arguments and
-     *                        returning a boolean. The callback is called
-     *                        when this function returns true.
+     *                        returning a boolean or a Promise. The callback is
+     *                        called when this function returns true, or the
+     *                        returned Promise is resolved with true.
      * @param {Function} func A function taking no arguments to call once
      *                        the condition is met.
      * @param {string} [description] Error message to add to assert in case of
@@ -2746,11 +2752,11 @@
         var remaining = Math.ceil(timeout_full / interval);
         var test_this = this;
 
-        var wait_for_inner = test_this.step_func(() => {
-            if (cond()) {
+        const step = test_this.step_func((result) => {
+            if (result) {
                 func();
             } else {
-                if(remaining === 0) {
+                if (remaining === 0) {
                     assert(false, "step_wait_func", description,
                            "Timed out waiting on condition");
                 }
@@ -2759,6 +2765,12 @@
             }
         });
 
+        var wait_for_inner = test_this.step_func(() => {
+            Promise.resolve(cond()).then(
+                step,
+                test_this.unreached_func("step_wait_func"));
+        });
+
         wait_for_inner();
     };
 
@@ -2784,8 +2796,9 @@
      * }, "Navigating a popup to about:blank");
      *
      * @param {Function} cond A function taking no arguments and
-     *                        returning a boolean. The callback is called
-     *                        when this function returns true.
+     *                        returning a boolean or a Promise. The callback is
+     *                        called when this function returns true, or the
+     *                        returned Promise is resolved with true.
      * @param {Function} func A function taking no arguments to call once
      *                        the condition is met.
      * @param {string} [description] Error message to add to assert in case of
@@ -2821,7 +2834,7 @@
      * }, "");
      *
      * @param {Function} cond A function taking no arguments and
-     *                        returning a boolean.
+     *                        returning a boolean or a Promise.
      * @param {string} [description] Error message to add to assert in case of
      *                              failure.
      * @param {number} timeout Timeout in ms. This is multiplied by the global
diff --git a/test/wpt/tests/service-workers/service-worker/partitioned-cookies.tentative.https.html b/test/wpt/tests/service-workers/service-worker/partitioned-cookies.tentative.https.html
index 5f6371cb428..7a8bd3f5cf8 100644
--- a/test/wpt/tests/service-workers/service-worker/partitioned-cookies.tentative.https.html
+++ b/test/wpt/tests/service-workers/service-worker/partitioned-cookies.tentative.https.html
@@ -7,12 +7,13 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
+<script src="resources/partitioned-cookies-test-helpers.js"></script>
 </head>
 
 <!--
-  This test exercises partitioned service workers' interaction with partitioned cookies.
-  Partitioned service workers should only be able to interact with partitioned cookies whose
-  partition key matches the worker's partition.
+  This test exercises partitioned service workers' interaction with partitioned
+  cookies. Partitioned service workers should only be able to interact with
+  partitioned cookies whose partition key matches the worker's partition.
 -->
 
 <body>
@@ -24,7 +25,8 @@
   const absolute_scope = new URL(scope, window.location).href;
 
   // Set a Partitioned cookie.
-  document.cookie = '__Host-partitioned=123; Secure; Path=/; SameSite=None; Partitioned;';
+  document.cookie =
+      '__Host-partitioned=123; Secure; Path=/; SameSite=None; Partitioned;';
   assert_true(document.cookie.includes('__Host-partitioned=123'));
 
   // Set an unpartitioned cookie.
@@ -35,12 +37,7 @@
   await wait_for_state(t, reg.installing, 'activated');
   t.add_cleanup(() => reg.unregister());
 
-  // on_message will be reassigned below based on the expected reply from the service worker.
-  let on_message;
-  self.addEventListener('message', ev => on_message(ev));
-  navigator.serviceWorker.addEventListener('message', evt => {
-    self.postMessage(evt.data, '*');
-  });
+  const next_message = worker_message_generator();
 
   const retrieved_registrations =
         await navigator.serviceWorker.getRegistrations();
@@ -49,62 +46,46 @@
   const filtered_registrations =
     retrieved_registrations.filter(reg => reg.scope == absolute_scope);
 
-  // First test that the worker script started correctly and message passing is enabed.
-  let resolve_wait_promise;
-  let wait_promise = new Promise(resolve => {
-    resolve_wait_promise = resolve;
-  });
-  let got;
-  on_message = ev => {
-    got = ev.data;
-    resolve_wait_promise();
-  };
+  // First test that the worker script started correctly and message passing
+  // is enabed.
   filtered_registrations[0].active.postMessage({type: 'test_message'});
-  await wait_promise;
-  assert_true(got.ok, 'Message passing');
+  const msg1 = await next_message();
+  assert_true(msg1.ok, 'Message passing');
 
   // Test that the partitioned cookie is available to this worker via HTTP.
-  wait_promise = new Promise(resolve => {
-    resolve_wait_promise = resolve;
-  });
-  on_message = ev => {
-    got = ev.data;
-    resolve_wait_promise();
-  };
   filtered_registrations[0].active.postMessage({type: 'echo_cookies_http'});
-  await wait_promise;
-  assert_true(got.ok, 'Get cookies');
-  assert_true(got.cookies.includes('__Host-partitioned'), 'Can access partitioned cookie via HTTP');
-  assert_true(got.cookies.includes('unpartitioned'), 'Can access unpartitioned cookie via HTTP');
+  const msg2 = await next_message();
+  assert_true(msg2.ok, 'Get cookies');
+  assert_true(
+      msg2.cookies.includes('__Host-partitioned'),
+      'Can access partitioned cookie via HTTP');
+  assert_true(
+      msg2.cookies.includes('unpartitioned'),
+      'Can access unpartitioned cookie via HTTP');
 
-  // Test that the partitioned cookie is available to this worker via CookieStore API.
-  wait_promise = new Promise(resolve => {
-    resolve_wait_promise = resolve;
-  });
-  on_message = ev => {
-    got = ev.data;
-    resolve_wait_promise();
-  };
+  // Test that the partitioned cookie is available to this worker via
+  // CookieStore API.
   filtered_registrations[0].active.postMessage({type: 'echo_cookies_js'});
-  await wait_promise;
-  assert_true(got.ok, 'Get cookies');
-  assert_true(got.cookies.includes('__Host-partitioned'), 'Can access partitioned cookie via JS');
-  assert_true(got.cookies.includes('unpartitioned'), 'Can access unpartitioned cookie via JS');
+  const msg3 = await next_message();
+  assert_true(msg3.ok, 'Get cookies');
+  assert_true(
+      msg3.cookies.includes('__Host-partitioned'),
+      'Can access partitioned cookie via JS');
+  assert_true(
+      msg3.cookies.includes('unpartitioned'),
+      'Can access unpartitioned cookie via JS');
 
   // Test that the partitioned cookie is not available to this worker in HTTP
   // requests from importScripts.
-  wait_promise = new Promise(resolve => {
-    resolve_wait_promise = resolve;
-  });
-  on_message = ev => {
-    got = ev.data;
-    resolve_wait_promise();
-  };
   filtered_registrations[0].active.postMessage({type: 'echo_cookies_import'});
-  await wait_promise;
-  assert_true(got.ok, 'Get cookies');
-  assert_true(got.cookies.includes('__Host-partitioned'), 'Can access partitioned cookie via importScripts');
-  assert_true(got.cookies.includes('unpartitioned'), 'Can access unpartitioned cookie via importScripts');
+  const msg4 = await next_message();
+  assert_true(msg4.ok, 'Get cookies');
+  assert_true(
+      msg4.cookies.includes('__Host-partitioned'),
+      'Can access partitioned cookie via importScripts');
+  assert_true(
+      msg4.cookies.includes('unpartitioned'),
+      'Can access unpartitioned cookie via importScripts');
 
   const popup = window.open(
       new URL(
diff --git a/test/wpt/tests/service-workers/service-worker/resources/fetch-access-control.py b/test/wpt/tests/service-workers/service-worker/resources/fetch-access-control.py
index 380a7d62225..67c837bca7d 100644
--- a/test/wpt/tests/service-workers/service-worker/resources/fetch-access-control.py
+++ b/test/wpt/tests/service-workers/service-worker/resources/fetch-access-control.py
@@ -39,8 +39,8 @@ def main(request, response):
           headers.append((b"Content-Type", b"video/mp4"))
           body = open(os.path.join(request.doc_root, u"media", u"movie_5.mp4"), "rb").read()
         else:
-          headers.append((b"Content-Type", b"video/ogg"))
-          body = open(os.path.join(request.doc_root, u"media", u"movie_5.ogv"), "rb").read()
+          headers.append((b"Content-Type", b"video/webm"))
+          body = open(os.path.join(request.doc_root, u"media", u"movie_5.webm"), "rb").read()
 
         length = len(body)
         # If "PartialContent" is specified, the requestor wants to test range
diff --git a/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-frame.html b/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-frame.html
index 00b3412c41f..97f3a9c3df3 100644
--- a/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-frame.html
+++ b/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-frame.html
@@ -3,6 +3,7 @@
 <meta charset="utf-8"/>
 <meta name="timeout" content="long">
 <title>Service Worker: Partitioned Cookies 3P Iframe</title>
+<script src="partitioned-cookies-test-helpers.js"></script>
 <script src="/resources/testharness.js"></script>
 <script src="test-helpers.sub.js"></script>
 </head>
@@ -15,8 +16,9 @@
   const scope = './partitioned-cookies-3p-';
   const absolute_scope = new URL(scope, window.location).href;
 
-  assert_false(document.cookie.includes('__Host-partitioned=123'), 'DOM cannot access partitioned cookie');
-  assert_true(document.cookie.includes('unpartitioned=456'), 'DOM can access unpartitioned cookie');
+  assert_false(
+      document.cookie.includes('__Host-partitioned=123'),
+      'DOM cannot access partitioned cookie');
 
   const reg = await service_worker_unregister_and_register(t, script, scope);
   await wait_for_state(t, reg.installing, 'activated');
@@ -26,80 +28,47 @@
   let filtered_registrations =
     retrieved_registrations.filter(reg => reg.scope == absolute_scope);
 
-  // on_message will be reassigned below based on the expected reply from the service worker.
-  let on_message;
-  self.addEventListener('message', ev => on_message(ev));
-  navigator.serviceWorker.addEventListener('message', evt => {
-    self.postMessage(evt.data, '*');
-  });
+  const next_message = worker_message_generator();
 
-  // First test that the worker script started correctly and message passing is enabled.
-  let resolve_wait_promise;
-  let wait_promise = new Promise(resolve => {
-    resolve_wait_promise = resolve;
-  });
-  let got;
-  on_message = ev => {
-    got = ev.data;
-    resolve_wait_promise();
-  };
+  // First test that the worker script started correctly and message passing
+  // is enabled.
   filtered_registrations[0].active.postMessage({type: 'test_message'});
-  await wait_promise;
-  assert_true(got.ok, 'Message passing');
+  const msg1 = await next_message();
+  assert_true(msg1.ok, 'Message passing');
 
   // Test that the partitioned cookie is not available to this worker via HTTP.
-  wait_promise = new Promise(resolve => {
-    resolve_wait_promise = resolve;
-  });
-  on_message = ev => {
-    got = ev.data;
-    resolve_wait_promise();
-  };
   filtered_registrations[0].active.postMessage({type: 'echo_cookies_http'});
-  await wait_promise;
-  assert_true(got.ok, 'Get cookies');
+  const msg2 = await next_message();
+  assert_true(msg2.ok, 'Get cookies');
   assert_false(
-      got.cookies.includes('__Host-partitioned'),
+      msg2.cookies.includes('__Host-partitioned'),
       'Worker cannot access partitioned cookie via HTTP');
   assert_true(
-      got.cookies.includes('unpartitioned'),
+      msg2.cookies.includes('unpartitioned'),
       'Worker can access unpartitioned cookie via HTTP');
 
-  // Test that the partitioned cookie is not available to this worker via CookieStore API.
-  wait_promise = new Promise(resolve => {
-    resolve_wait_promise = resolve;
-  });
-  on_message = ev => {
-    got = ev.data;
-    resolve_wait_promise();
-  };
+  // Test that the partitioned cookie is not available to this worker via
+  // CookieStore API.
   filtered_registrations[0].active.postMessage({type: 'echo_cookies_js'});
-  await wait_promise;
-  assert_true(got.ok, 'Get cookies');
+  const msg3 = await next_message();
+  assert_true(msg3.ok, 'Get cookies');
   assert_false(
-      got.cookies.includes('__Host-partitioned'),
+      msg3.cookies.includes('__Host-partitioned'),
       'Worker cannot access partitioned cookie via JS');
   assert_true(
-      got.cookies.includes('unpartitioned'),
+      msg3.cookies.includes('unpartitioned'),
       'Worker can access unpartitioned cookie via JS');
 
   // Test that the partitioned cookie is not available to this worker in HTTP
   // requests from importScripts.
-  wait_promise = new Promise(resolve => {
-    resolve_wait_promise = resolve;
-  });
-  on_message = ev => {
-    got = ev.data;
-    resolve_wait_promise();
-  };
   filtered_registrations[0].active.postMessage({type: 'echo_cookies_import'});
-  await wait_promise;
-  assert_true(got.ok, 'Get cookies');
+  const msg4 = await next_message();
+  assert_true(msg4.ok, 'Get cookies');
   assert_false(
-      got.cookies.includes('__Host-partitioned'),
+      msg4.cookies.includes('__Host-partitioned'),
       'Worker cannot access partitioned cookie via importScripts');
   assert_true(
-      got.cookies.includes('unpartitioned'),
+      msg4.cookies.includes('unpartitioned'),
       'Worker can access unpartitioned cookie via importScripts');
 });
 
diff --git a/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-sw.js b/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-sw.js
index 767dbf44327..c9713b6c50c 100644
--- a/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-sw.js
+++ b/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-3p-sw.js
@@ -1,53 +1,3 @@
-self.addEventListener('message', ev => ev.waitUntil(onMessage(ev)));
-
-async function onMessage(event) {
-  if (!event.data)
-    return;
-  switch (event.data.type) {
-    case 'test_message':
-      return onTestMessage(event);
-    case 'echo_cookies_http':
-      return onEchoCookiesHttp(event);
-    case 'echo_cookies_js':
-      return onEchoCookiesJs(event);
-    case 'echo_cookies_import':
-      return onEchoCookiesImport(event);
-    default:
-      return;
-  }
-}
-
-// test_message just verifies that the message passing is working.
-async function onTestMessage(event) {
-  event.source.postMessage({ok: true});
-}
-
-async function onEchoCookiesHttp(event) {
-  try {
-    const resp = await fetch(
-        `${self.origin}/cookies/resources/list.py`, {credentials: 'include'});
-    const cookies = await resp.json();
-    event.source.postMessage({ok: true, cookies: Object.keys(cookies)});
-  } catch (err) {
-    event.source.postMessage({ok: false});
-  }
-}
-
-// echo_cookies returns the names of all of the cookies available to the worker.
-async function onEchoCookiesJs(event) {
-  try {
-    const cookie_objects = await self.cookieStore.getAll();
-    const cookies = cookie_objects.map(c => c.name);
-    event.source.postMessage({ok: true, cookies});
-  } catch (err) {
-    event.source.postMessage({ok: false});
-  }
-}
-
-// Sets `self._cookies` variable, array of the names of cookies available to
-// the request.
-importScripts(`${self.origin}/cookies/resources/list-cookies-for-script.py`);
-
-function onEchoCookiesImport(event) {
-  event.source.postMessage({ok: true, cookies: self._cookies});
-}
+// Import the code from the 1P partitioned worker.
+// We use separate URLs for each worker script to keep their scopes unique.
+importScripts('./partitioned-cookies-sw.js');
diff --git a/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-test-helpers.js b/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-test-helpers.js
new file mode 100644
index 00000000000..73f3b0bde06
--- /dev/null
+++ b/test/wpt/tests/service-workers/service-worker/resources/partitioned-cookies-test-helpers.js
@@ -0,0 +1,31 @@
+// Return a generator containing the worker's message.
+//
+// Usage:
+//   await navigator.serviceWorker.register(...)
+//   ...
+//   const nextMessage = worker_message_generator();
+//   const msg_1 = await nextMessage();
+//   const msg_2 = await nextMessage();
+//   const msg_3 = await nextMessage();
+//
+// Worker should have its own onmessage event listener that
+// postMessages replies to the DOM.
+function worker_message_generator() {
+  const buffer = [];
+  let resolve = null;
+
+  navigator.serviceWorker.addEventListener('message', message => {
+    buffer.push(message.data);
+    if (resolve) {
+      resolve();
+    }
+  });
+
+  return async function () {
+    if (buffer.length != 0) {
+      return buffer.shift();
+    }
+    await new Promise(r => resolve = r);
+    return buffer.shift();
+  }
+}
diff --git a/test/wpt/tests/service-workers/service-worker/resources/scope1/redirect.py b/test/wpt/tests/service-workers/service-worker/resources/scope1/redirect.py
index bb4c874aace..025ea671c50 100644
--- a/test/wpt/tests/service-workers/service-worker/resources/scope1/redirect.py
+++ b/test/wpt/tests/service-workers/service-worker/resources/scope1/redirect.py
@@ -1,6 +1,8 @@
 import os
-import imp
+
+from tools.wpt.utils import load_source
+
 # Use the file from the parent directory.
-mod = imp.load_source("_parent", os.path.join(os.path.dirname(os.path.dirname(__file__)),
+mod = load_source("_parent", os.path.join(os.path.dirname(os.path.dirname(__file__)),
                                               os.path.basename(__file__)))
 main = mod.main
diff --git a/test/wpt/tests/service-workers/service-worker/resources/scope2/worker_interception_redirect_webworker.py b/test/wpt/tests/service-workers/service-worker/resources/scope2/worker_interception_redirect_webworker.py
index bb4c874aace..025ea671c50 100644
--- a/test/wpt/tests/service-workers/service-worker/resources/scope2/worker_interception_redirect_webworker.py
+++ b/test/wpt/tests/service-workers/service-worker/resources/scope2/worker_interception_redirect_webworker.py
@@ -1,6 +1,8 @@
 import os
-import imp
+
+from tools.wpt.utils import load_source
+
 # Use the file from the parent directory.
-mod = imp.load_source("_parent", os.path.join(os.path.dirname(os.path.dirname(__file__)),
+mod = load_source("_parent", os.path.join(os.path.dirname(os.path.dirname(__file__)),
                                               os.path.basename(__file__)))
 main = mod.main
diff --git a/test/wpt/tests/service-workers/service-worker/resources/subdir/worker_interception_redirect_webworker.py b/test/wpt/tests/service-workers/service-worker/resources/subdir/worker_interception_redirect_webworker.py
index bb4c874aace..025ea671c50 100644
--- a/test/wpt/tests/service-workers/service-worker/resources/subdir/worker_interception_redirect_webworker.py
+++ b/test/wpt/tests/service-workers/service-worker/resources/subdir/worker_interception_redirect_webworker.py
@@ -1,6 +1,8 @@
 import os
-import imp
+
+from tools.wpt.utils import load_source
+
 # Use the file from the parent directory.
-mod = imp.load_source("_parent", os.path.join(os.path.dirname(os.path.dirname(__file__)),
+mod = load_source("_parent", os.path.join(os.path.dirname(os.path.dirname(__file__)),
                                               os.path.basename(__file__)))
 main = mod.main
diff --git a/test/wpt/tests/service-workers/service-worker/tentative/static-router/README.md b/test/wpt/tests/service-workers/service-worker/tentative/static-router/README.md
index 8826b3c7827..5429b61d40e 100644
--- a/test/wpt/tests/service-workers/service-worker/tentative/static-router/README.md
+++ b/test/wpt/tests/service-workers/service-worker/tentative/static-router/README.md
@@ -1,4 +1,4 @@
-A test stuite for the ServiceWorker Static Routing API.
+A test suite for the ServiceWorker Static Routing API.
 
 WICG proposal: https://github.com/WICG/proposals/issues/102
 Specification PR: https://github.com/w3c/ServiceWorker/pull/1686
diff --git a/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct1.text b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct1.text
new file mode 100644
index 00000000000..f3d9861c137
--- /dev/null
+++ b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct1.text
@@ -0,0 +1 @@
+Network
diff --git a/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct1.text.headers b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct1.text.headers
new file mode 100644
index 00000000000..156209f9c81
--- /dev/null
+++ b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct1.text.headers
@@ -0,0 +1 @@
+Content-Type: text/html
diff --git a/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct2.text b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct2.text
new file mode 100644
index 00000000000..f3d9861c137
--- /dev/null
+++ b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct2.text
@@ -0,0 +1 @@
+Network
diff --git a/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct2.text.headers b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct2.text.headers
new file mode 100644
index 00000000000..156209f9c81
--- /dev/null
+++ b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/or-test/direct2.text.headers
@@ -0,0 +1 @@
+Content-Type: text/html
diff --git a/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/router-rules.js b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/router-rules.js
new file mode 100644
index 00000000000..67871a2d4fd
--- /dev/null
+++ b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/router-rules.js
@@ -0,0 +1,30 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+const routerRules = {
+  'condition-urlpattern-constructed-source-network': [{
+    condition: {urlPattern: new URLPattern({pathname: '/**/direct.txt'})},
+    source: 'network'
+  }],
+  'condition-urlpattern-urlpatterninit-source-network': [
+    {condition: {urlPattern: {pathname: '/**/direct.txt'}}, source: 'network'},
+  ],
+  'condition-urlpattern-string-source-network': [
+    {condition: {urlPattern: '/**/direct.txt'}, source: 'network'},
+  ],
+  'condition-request-source-network':
+      [{condition: {requestMode: 'no-cors'}, source: 'network'}],
+  'condition-or-source-network': [{
+    condition: {
+      or: [
+        {
+          or: [{urlPattern: '/**/or-test/direct1.*??*'}],
+        },
+        {urlPattern: '/**/or-test/direct2.*??*'}
+      ]
+    },
+    source: 'network'
+  }],
+};
+
+export {routerRules};
diff --git a/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/simple.csv b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/simple.csv
new file mode 100644
index 00000000000..ecbef786e73
--- /dev/null
+++ b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/simple.csv
@@ -0,0 +1 @@
+matched,with,non-url,conditions
diff --git a/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/static-router-sw.js b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/static-router-sw.js
index 4655ab5321c..1e02dbb56de 100644
--- a/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/static-router-sw.js
+++ b/test/wpt/tests/service-workers/service-worker/tentative/static-router/resources/static-router-sw.js
@@ -1,20 +1,13 @@
 'use strict';
 
+import {routerRules} from './router-rules.js';
+
 var requests = [];
 
-self.addEventListener('install', e => {
-  e.registerRouter([
-    {
-      condition: {urlPattern: '/**/*.txt??*'},
-      // Note: "??*" is for allowing arbitrary query strings.
-      // Upon my experiment, the URLPattern needs two '?'s for specifying
-      // a coming string as a query.
-      source: 'network'
-    }, {
-      condition: {
-        urlPattern: '/**/simple-test-for-condition-main-resource.html'},
-      source: 'network'
-    }]);
+self.addEventListener('install', async e => {
+  const params = new URLSearchParams(location.search);
+  const key = params.get('key');
+  await e.addRoutes(routerRules[key]);
   self.skipWaiting();
 });
 
diff --git a/test/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html b/test/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html
index 5a55783af57..523ececf317 100644
--- a/test/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html
+++ b/test/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-main-resource.https.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>Static Router: simply skip fetch handler for main resource if pattern matches</title>
+<title>
+  Static Router: simply skip fetch handler for main resource if pattern matches
+</title>
 <script src="/common/get-host-info.sub.js"></script>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -8,17 +10,19 @@
 <body>
 <script>
 const SCRIPT = 'resources/static-router-sw.js';
+const ROUTER_RULE_KEY = 'condition-urlpattern-constructed-source-network';
 const SCOPE = 'resources/';
-const REGISTERED_ROUTE_HTML =
-  'resources/simple-test-for-condition-main-resource.html';
-const NON_REGISTERED_ROUTE_HTML = 'resources/simple.html';
+const REGISTERED_ROUTE = 'resources/direct.txt';
+const NON_REGISTERED_ROUTE = 'resources/simple.html';
 const host_info = get_host_info();
 const path = new URL(".", window.location).pathname;
 
 // Register a service worker, then create an iframe at url.
-function iframeTest(url, callback, name) {
+function iframeTest(url, ruleKey, callback, name) {
   return promise_test(async t => {
-    const reg = await service_worker_unregister_and_register(t, SCRIPT, SCOPE);
+    const swURL = `${SCRIPT}?key=${ruleKey}`;
+    const reg = await service_worker_unregister_and_register(
+      t, swURL, SCOPE, {type: 'module'});
     add_completion_callback(() => reg.unregister());
     const worker = reg.installing;
     await wait_for_state(t, worker, 'activated');
@@ -37,20 +41,20 @@
     });
 }
 
-iframeTest(REGISTERED_ROUTE_HTML, async (t, iwin, worker) => {
+iframeTest(REGISTERED_ROUTE, ROUTER_RULE_KEY, async (t, iwin, worker) => {
   const fetched_urls = await get_fetched_urls(worker);
   const {requests} = fetched_urls.data;
   assert_equals(requests.length, 0);
-  assert_equals(iwin.document.body.innerText, "Here's a simple html file.");
+  assert_equals(iwin.document.body.innerText, "Network\n");
 }, 'Main resource load matched with the condition');
 
-iframeTest(NON_REGISTERED_ROUTE_HTML, async (t, iwin, worker) => {
+iframeTest(NON_REGISTERED_ROUTE, ROUTER_RULE_KEY, async (t, iwin, worker) => {
   const fetched_urls = await get_fetched_urls(worker);
   const {requests} = fetched_urls.data;
   assert_equals(requests.length, 1);
   assert_equals(
     requests[0].url,
-    `${host_info['HTTPS_ORIGIN']}${path}${NON_REGISTERED_ROUTE_HTML}`);
+    `${host_info['HTTPS_ORIGIN']}${path}${NON_REGISTERED_ROUTE}`);
   assert_equals(requests[0].mode, 'navigate');
 }, 'Main resource load not matched with the condition');
 
diff --git a/test/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html b/test/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html
index 721c2797603..1fd3880bf26 100644
--- a/test/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html
+++ b/test/wpt/tests/service-workers/service-worker/tentative/static-router/static-router-subresource.https.html
@@ -4,23 +4,43 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
 <body>
 <script>
 const SCRIPT = 'resources/static-router-sw.js';
+const ROUTER_RULE_KEY_URL_PATTERN_CONSTRUCTED =
+  'condition-urlpattern-constructed-source-network';
+const ROUTER_RULE_KEY_URL_PATTERN_URLPATTERNINIT =
+  'condition-urlpattern-urlpatterninit-source-network';
+const ROUTER_RULE_KEY_URL_PATTERN_STRING =
+  'condition-urlpattern-string-source-network';
+const ROUTER_RULE_KEY_REQUEST = 'condition-request-source-network'
+const ROUTER_RULE_KEY_OR = 'condition-or-source-network'
 const SCOPE = 'resources/';
 const HTML_FILE = 'resources/simple.html';
 const TXT_FILE = 'resources/direct.txt';
+const CSV_FILE = 'resources/simple.csv';
+// Warning: please prepare the corresponding `*.text.headers` files, otherwise
+// iframeTest() fails to load the following files due to MIME mismatches.
+const OR_TEST_FILES = [
+  'resources/or-test/direct1.text',
+  'resources/or-test/direct2.text',
+  'resources/or-test/does-not-exist.text',
+];
 
 // Register a service worker, then create an iframe at url.
-function iframeTest(url, callback, name) {
+function iframeTest(url, ruleKey, callback, name) {
   return promise_test(async t => {
-    const reg = await service_worker_unregister_and_register(t, SCRIPT, SCOPE);
+    const swURL = `${SCRIPT}?key=${ruleKey}`;
+    const reg = await service_worker_unregister_and_register(
+      t, swURL, SCOPE, {type: 'module'});
     add_completion_callback(() => reg.unregister());
-    await wait_for_state(t, reg.installing, 'activated');
+    const worker = reg.installing;
+    await wait_for_state(t, worker, 'activated');
     const iframe = await with_iframe(url);
     const iwin = iframe.contentWindow;
     t.add_cleanup(() => iframe.remove());
-    await callback(t, iwin);
+    await callback(t, iwin, worker);
   }, name);
 }
 
@@ -32,17 +52,106 @@
   return result;
 }
 
-iframeTest(HTML_FILE, async (t, iwin) => {
+function get_fetched_urls(worker) {
+  return new Promise(function(resolve) {
+      var channel = new MessageChannel();
+      channel.port1.onmessage = function(msg) { resolve(msg); };
+      worker.postMessage({port: channel.port2}, [channel.port2]);
+    });
+}
+
+iframeTest(HTML_FILE, ROUTER_RULE_KEY_URL_PATTERN_CONSTRUCTED, async (t, iwin) => {
+  const rnd = randomString();
+  const response = await iwin.fetch('?nonce=' + rnd);
+  assert_equals(await response.text(), rnd);
+}, 'Subresource load not matched with URLPattern condition');
+
+iframeTest(TXT_FILE, ROUTER_RULE_KEY_URL_PATTERN_CONSTRUCTED, async (t, iwin) => {
+  const rnd = randomString();
+  const response = await iwin.fetch('?nonce=' + rnd);
+  assert_equals(await response.text(), "Network\n");
+}, 'Subresource load matched with URLPattern condition');
+
+iframeTest(TXT_FILE, ROUTER_RULE_KEY_URL_PATTERN_CONSTRUCTED, async (t, iwin, worker) => {
+  const rnd = randomString();
+  // Confirm that the given URLPatternInit has a wildcard pattern for the
+  // hostname. Also, if |urlPattern| is a consutructed URLPattern object,
+  // baseURL won't be set while adding router rules, thus it matches the cross
+  // origin request as far as other components matches. So expecting the direct
+  // network request and the fetch handler doesn't capture the response.
+  // The response is going to be a opaque.
+  const origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+  const response = await iwin.fetch(
+    `${origin}/${TXT_FILE}?nonce=${rnd}`, {mode: 'no-cors'});
+  const fetched_urls = await get_fetched_urls(worker);
+  const {requests} = fetched_urls.data;
+  assert_equals(requests.length, 0);
+  assert_equals(response.type, 'opaque');
+}, 'Subresource cross origin load matched with URLPattern condition via constructed object');
+
+iframeTest(TXT_FILE, ROUTER_RULE_KEY_URL_PATTERN_URLPATTERNINIT, async (t, iwin) => {
+  const rnd = randomString();
+  const response = await iwin.fetch('?nonce=' + rnd);
+  assert_equals(await response.text(), "Network\n");
+}, 'Subresource load matched with URLPattern condition via URLPatternInit');
+
+iframeTest(TXT_FILE, ROUTER_RULE_KEY_URL_PATTERN_URLPATTERNINIT, async (t, iwin, worker) => {
+  // The SW script URL is added as a baseURL when |urlPattern| is passed via
+  // URLPatternInit, and there is not |baseURL| in it. Cross origin request will
+  // go through the fetch handler because |baseURL| info complements hostname
+  // with the hostname of the SW script.
+  const rnd = randomString();
+  const origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+  const response = await iwin.fetch(`${origin}/${TXT_FILE}?nonce=${rnd}`);
+  const fetched_urls = await get_fetched_urls(worker);
+  const {requests} = fetched_urls.data;
+  assert_equals(requests.length, 1);
+  assert_equals(await response.text(), rnd);
+}, 'Subresource cross origin load not matched with URLPattern condition via URLPatternInit');
+
+iframeTest(TXT_FILE, ROUTER_RULE_KEY_URL_PATTERN_STRING, async (t, iwin) => {
   const rnd = randomString();
   const response = await iwin.fetch('?nonce=' + rnd);
+  assert_equals(await response.text(), "Network\n");
+}, 'Subresource load matched with URLPattern condition via string');
+
+iframeTest(TXT_FILE, ROUTER_RULE_KEY_URL_PATTERN_STRING, async (t, iwin, worker) => {
+  // The SW script URL is added as a baseURL when |urlPattern| is passed via
+  // string, and there is not |baseURL| in it. Cross origin request will go
+  // through the fetch handler because |baseURL| info complements hostname with
+  // the hostname of the SW script.
+  const rnd = randomString();
+  const origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+  const response = await iwin.fetch(`${origin}/${TXT_FILE}?nonce=${rnd}`);
+  const fetched_urls = await get_fetched_urls(worker);
+  const {requests} = fetched_urls.data;
+  assert_equals(requests.length, 1);
   assert_equals(await response.text(), rnd);
-}, 'Subresource load not matched with the condition');
+}, 'Subresource cross origin load not matched with URLPattern condition via string');
+
+iframeTest(CSV_FILE, ROUTER_RULE_KEY_REQUEST, async (t, iwin) => {
+  const rnd = randomString();
+  const response = await iwin.fetch('?nonce=' + rnd, { mode: 'no-cors' });
+  assert_equals(await response.text(), "matched,with,non-url,conditions\n");
+}, 'Subresource load matched with RequestMode condition');
 
-iframeTest(TXT_FILE, async (t, iwin) => {
+iframeTest(OR_TEST_FILES[0], ROUTER_RULE_KEY_OR, async (t, iwin) => {
   const rnd = randomString();
   const response = await iwin.fetch('?nonce=' + rnd);
   assert_equals(await response.text(), "Network\n");
-}, 'Subresource load matched with the condition');
+}, 'Subresource load matched with the nested `or` condition');
+
+iframeTest(OR_TEST_FILES[1], ROUTER_RULE_KEY_OR, async (t, iwin) => {
+  const rnd = randomString();
+  const response = await iwin.fetch('?nonce=' + rnd);
+  assert_equals(await response.text(), "Network\n");
+}, 'Subresource load matched with the next `or` condition');
+
+iframeTest(OR_TEST_FILES[2], ROUTER_RULE_KEY_OR, async (t, iwin) => {
+  const rnd = randomString();
+  const response = await iwin.fetch('?nonce=' + rnd);
+  assert_equals(await response.text(), rnd);
+}, 'Subresource load not matched with `or` condition');
 
 </script>
 </body>
diff --git a/test/wpt/tests/storage/buckets/META.yml b/test/wpt/tests/storage/buckets/META.yml
index 4f215060f5a..4b63200cddb 100644
--- a/test/wpt/tests/storage/buckets/META.yml
+++ b/test/wpt/tests/storage/buckets/META.yml
@@ -1,5 +1,5 @@
-spec: https://github.com/WICG/storage-buckets
+spec: https://wicg.github.io/storage-buckets/
 suggested_reviewers:
-  - ayui
-  - jsbell
-  - pwnall
+  - ayuishii
+  - evanstade
+  - inexorabletash
diff --git a/test/wpt/tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js b/test/wpt/tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js
index ba82edb72ec..e03aaa802d0 100644
--- a/test/wpt/tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js
+++ b/test/wpt/tests/storage/buckets/bucket-quota-indexeddb.tentative.https.any.js
@@ -7,7 +7,7 @@ promise_test(async t => {
   const dbname =
       this.window ? window.location.pathname : 'estimate-worker.https.html';
 
-  let quota = arraySize / 2;
+  let quota = arraySize * 1.5;
   const bucket = await navigator.storageBuckets.open('idb', {quota});
 
   await indexedDbDeleteRequest(bucket.indexedDB, dbname);
@@ -25,8 +25,13 @@ promise_test(async t => {
     view[i] = Math.floor(Math.random() * 255);
   }
 
-  const testBlob = new Blob([buffer], {type: 'binary/random'});
-  txn.objectStore(objectStoreName).add(testBlob, 1);
+  // Two puts in one transaction to ensure that both are counted towards quota.
+  txn.objectStore(objectStoreName).add(new Blob([buffer], {
+    type: 'binary/random'
+  }), 1);
+  txn.objectStore(objectStoreName).add(new Blob([buffer], {
+    type: 'binary/random'
+  }), 2);
 
   await promise_rejects_dom(
       t, 'QuotaExceededError', transactionPromise(txn));
diff --git a/test/wpt/tests/storage/estimate-indexeddb.https.any.js b/test/wpt/tests/storage/estimate-indexeddb.https.any.js
index f0b82b9fa09..6577b021ad5 100644
--- a/test/wpt/tests/storage/estimate-indexeddb.https.any.js
+++ b/test/wpt/tests/storage/estimate-indexeddb.https.any.js
@@ -1,21 +1,8 @@
 // META: title=StorageManager: estimate() for indexeddb
 // META: script=/storage/buckets/resources/util.js
 
-test(t => {
-  assert_true('estimate' in navigator.storage);
-  assert_equals(typeof navigator.storage.estimate, 'function');
-  assert_true(navigator.storage.estimate() instanceof Promise);
-}, 'estimate() method exists and returns a Promise');
-
-promise_test(async t => {
-  const estimate = await navigator.storage.estimate();
-  assert_equals(typeof estimate, 'object');
-  assert_true('usage' in estimate);
-  assert_equals(typeof estimate.usage, 'number');
-  assert_true('quota' in estimate);
-  assert_equals(typeof estimate.quota, 'number');
-}, 'estimate() resolves to dictionary with members');
-
+// Technically, this verifies unspecced behavior. See
+// https://github.com/whatwg/storage/issues/110 for defining this behavior.
 promise_test(async t => {
   const arraySize = 1e6;
   const objectStoreName = "storageManager";
diff --git a/test/wpt/tests/storage/storagemanager-estimate.https.any.js b/test/wpt/tests/storage/storagemanager-estimate.https.any.js
index c2f5c569dc5..3b6f4d8edc4 100644
--- a/test/wpt/tests/storage/storagemanager-estimate.https.any.js
+++ b/test/wpt/tests/storage/storagemanager-estimate.https.any.js
@@ -1,60 +1,16 @@
 // META: title=StorageManager: estimate()
 
-test(function(t) {
-    assert_true(navigator.storage.estimate() instanceof Promise);
-}, 'estimate() method returns a Promise');
+test(t => {
+  assert_true('estimate' in navigator.storage);
+  assert_equals(typeof navigator.storage.estimate, 'function');
+  assert_true(navigator.storage.estimate() instanceof Promise);
+}, 'estimate() method exists and returns a Promise');
 
-promise_test(function(t) {
-    return navigator.storage.estimate().then(function(result) {
-        assert_equals(typeof result, 'object');
-        assert_true('usage' in result);
-        assert_equals(typeof result.usage, 'number');
-        assert_true('quota' in result);
-        assert_equals(typeof result.quota, 'number');
-    });
+promise_test(async t => {
+  const result = await navigator.storage.estimate();
+  assert_equals(typeof result, 'object');
+  assert_true('usage' in result);
+  assert_equals(typeof result.usage, 'number');
+  assert_true('quota' in result);
+  assert_equals(typeof result.quota, 'number');
 }, 'estimate() resolves to dictionary with members');
-
-promise_test(function(t) {
-    const large_value = new Uint8Array(1e6);
-    const dbname = `db-${location}-${t.name}`;
-    let db, before, after;
-
-    indexedDB.deleteDatabase(dbname);
-    return new Promise((resolve, reject) => {
-            const open = indexedDB.open(dbname);
-            open.onerror = () => { reject(open.error); };
-            open.onupgradeneeded = () => {
-                const connection = open.result;
-                connection.createObjectStore('store');
-            };
-            open.onsuccess = () => {
-                const connection = open.result;
-                t.add_cleanup(() => {
-                    connection.close();
-                    indexedDB.deleteDatabase(dbname);
-                });
-                resolve(connection);
-            };
-        })
-        .then(connection => {
-            db = connection;
-            return navigator.storage.estimate();
-        })
-        .then(estimate => {
-            before = estimate.usage;
-            return new Promise((resolve, reject) => {
-                const tx = db.transaction('store', 'readwrite');
-                tx.objectStore('store').put(large_value, 'key');
-                tx.onabort = () => { reject(tx.error); };
-                tx.oncomplete = () => { resolve(); };
-            });
-        })
-        .then(() => {
-            return navigator.storage.estimate();
-        })
-        .then(estimate => {
-            after = estimate.usage;
-            assert_greater_than(after, before,
-                                'estimated usage should increase');
-        });
-}, 'estimate() shows usage increase after 1MB IndexedDB record is stored');
diff --git a/test/wpt/tests/websockets/META.yml b/test/wpt/tests/websockets/META.yml
index da999b994f3..77a6bff0bff 100644
--- a/test/wpt/tests/websockets/META.yml
+++ b/test/wpt/tests/websockets/META.yml
@@ -3,4 +3,3 @@ suggested_reviewers:
   - jdm
   - ricea
   - yutakahirano
-  - zqzhang
diff --git a/test/wpt/tests/websockets/handlers/sleep_10_v13_wsh.py b/test/wpt/tests/websockets/handlers/sleep_10_v13_wsh.py
index b0f1ddeb9ad..bdef2f2afdd 100644
--- a/test/wpt/tests/websockets/handlers/sleep_10_v13_wsh.py
+++ b/test/wpt/tests/websockets/handlers/sleep_10_v13_wsh.py
@@ -4,16 +4,7 @@
 from mod_pywebsocket import msgutil
 
 def web_socket_do_extra_handshake(request):
-    request.connection.write(b'x')
-    time.sleep(2)
-    request.connection.write(b'x')
-    time.sleep(2)
-    request.connection.write(b'x')
-    time.sleep(2)
-    request.connection.write(b'x')
-    time.sleep(2)
-    request.connection.write(b'x')
-    time.sleep(2)
+    time.sleep(10)
     return
 
 def web_socket_transfer_data(request):
diff --git a/test/wpt/tests/websockets/interfaces/WebSocket/close/close-connecting-async.any.js b/test/wpt/tests/websockets/interfaces/WebSocket/close/close-connecting-async.any.js
new file mode 100644
index 00000000000..88005520b00
--- /dev/null
+++ b/test/wpt/tests/websockets/interfaces/WebSocket/close/close-connecting-async.any.js
@@ -0,0 +1,31 @@
+// META: script=../../../constants.sub.js
+// META: variant=?default
+// META: variant=?wpt_flags=h2
+// META: variant=?wss
+
+async_test(t => {
+  const ws = new WebSocket(SCHEME_DOMAIN_PORT + '/handshake_sleep_2');
+  let closeMethodReturned = false;
+  let errorEventSeen = false;
+  let closeEventSeen = false;
+  ws.onerror = t.step_func(() => {
+    assert_true(closeMethodReturned, 'ws.close() should have returned');
+    assert_false(errorEventSeen, 'error event should only fire once');
+    errorEventSeen = true;
+    assert_false(closeEventSeen, 'error event should come before close event');
+  });
+  ws.onclose = t.step_func_done(() => {
+    assert_true(closeMethodReturned, 'ws.close() should have returned');
+    assert_true(errorEventSeen, 'error event should have fired');
+    assert_false(closeEventSeen, 'close event should only fire once');
+    closeEventSeen = true;
+    assert_equals(ws.readyState, WebSocket.CLOSED,
+                  'readyState should be CLOSED');
+  });
+  assert_equals(ws.readyState, WebSocket.CONNECTING,
+                'readyState should be CONNECTING');
+  ws.close();
+  closeMethodReturned = true;
+  assert_equals(ws.readyState, WebSocket.CLOSING,
+                'readyState should be CLOSING');
+}, 'close event should be fired asynchronously when WebSocket is connecting');
diff --git a/test/wpt/tests/websockets/opening-handshake/006.html b/test/wpt/tests/websockets/opening-handshake/006.html
new file mode 100644
index 00000000000..304069037cc
--- /dev/null
+++ b/test/wpt/tests/websockets/opening-handshake/006.html
@@ -0,0 +1,58 @@
+<!doctype html>
+<title>WebSockets: Serialized connection attempts</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../constants.sub.js"></script>
+<meta name="variant" content="?default">
+<meta name="variant" content="?wss">
+<div id="log"></div>
+<script>
+async_test(function(t) {
+  const paths = ['/invalid1', '/invalid2', '/invalid3', '/echo']; // /echo is valid
+  let currentTestIndex = 0;
+  let isPreviousConnectionClosed = true;
+
+  function testNextPath() {
+    if (currentTestIndex < paths.length) {
+      t.step(function() {
+        assert_true(isPreviousConnectionClosed, "Previous connection should be closed before attempting a new one");
+        isPreviousConnectionClosed = false;
+
+        const path = paths[currentTestIndex];
+        const ws = new WebSocket(SCHEME_DOMAIN_PORT + path);
+
+        ws.onclose = t.step_func(function(e) {
+          if (path !== '/echo') {
+            assert_false(e.wasClean, "Connection should fail uncleanly for path: " + path);
+          } else {
+            assert_true(e.wasClean, "Connection to /echo should close cleanly");
+          }
+          isPreviousConnectionClosed = true;
+          currentTestIndex++;
+          t.step_timeout(testNextPath, 0); // Schedule the next test
+        });
+
+        ws.onopen = t.step_func(function() {
+          if (path === '/echo') {
+            assert_true(true, "Connection to /echo should succeed");
+            ws.close();
+          } else {
+            t.unreached_func("Invalid path should not succeed");
+          }
+        });
+
+        ws.onerror = t.step_func(function() {
+          if (path === '/echo') {
+            t.unreached_func("Connection to /echo should not encounter an error");
+          } // otherwise failure is expected
+        });
+      });
+    } else {
+      t.done();
+    }
+  }
+
+  testNextPath();
+});
+</script>
diff --git a/test/wpt/tests/xhr/resources/auth1/auth.py b/test/wpt/tests/xhr/resources/auth1/auth.py
index db4f7bc4c9f..3797aaa52e9 100644
--- a/test/wpt/tests/xhr/resources/auth1/auth.py
+++ b/test/wpt/tests/xhr/resources/auth1/auth.py
@@ -1,12 +1,13 @@
-import imp
 import os
 
 from wptserve.utils import isomorphic_decode
 
+from tools.wpt.utils import load_source
+
 here = os.path.dirname(os.path.abspath(isomorphic_decode(__file__)))
 
 def main(request, response):
-    auth = imp.load_source(u"", os.path.join(here,
+    auth = load_source(u"", os.path.join(here,
                                              u"..",
                                              u"authentication.py"))
     return auth.main(request, response)
diff --git a/test/wpt/tests/xhr/resources/auth10/auth.py b/test/wpt/tests/xhr/resources/auth10/auth.py
index db4f7bc4c9f..568d31e9068 100644
--- a/test/wpt/tests/xhr/resources/auth10/auth.py
+++ b/test/wpt/tests/xhr/resources/auth10/auth.py
@@ -1,12 +1,14 @@
-import imp
 import os
 
 from wptserve.utils import isomorphic_decode
 
+from tools.wpt.utils import load_source
+
 here = os.path.dirname(os.path.abspath(isomorphic_decode(__file__)))
 
+
 def main(request, response):
-    auth = imp.load_source(u"", os.path.join(here,
+    auth = load_source(u"", os.path.join(here,
                                              u"..",
                                              u"authentication.py"))
     return auth.main(request, response)
diff --git a/test/wpt/tests/xhr/resources/auth11/auth.py b/test/wpt/tests/xhr/resources/auth11/auth.py
index db4f7bc4c9f..3797aaa52e9 100644
--- a/test/wpt/tests/xhr/resources/auth11/auth.py
+++ b/test/wpt/tests/xhr/resources/auth11/auth.py
@@ -1,12 +1,13 @@
-import imp
 import os
 
 from wptserve.utils import isomorphic_decode
 
+from tools.wpt.utils import load_source
+
 here = os.path.dirname(os.path.abspath(isomorphic_decode(__file__)))
 
 def main(request, response):
-    auth = imp.load_source(u"", os.path.join(here,
+    auth = load_source(u"", os.path.join(here,
                                              u"..",
                                              u"authentication.py"))
     return auth.main(request, response)
diff --git a/test/wpt/tests/xhr/resources/auth2/auth.py b/test/wpt/tests/xhr/resources/auth2/auth.py
index db4f7bc4c9f..568d31e9068 100644
--- a/test/wpt/tests/xhr/resources/auth2/auth.py
+++ b/test/wpt/tests/xhr/resources/auth2/auth.py
@@ -1,12 +1,14 @@
-import imp
 import os
 
 from wptserve.utils import isomorphic_decode
 
+from tools.wpt.utils import load_source
+
 here = os.path.dirname(os.path.abspath(isomorphic_decode(__file__)))
 
+
 def main(request, response):
-    auth = imp.load_source(u"", os.path.join(here,
+    auth = load_source(u"", os.path.join(here,
                                              u"..",
                                              u"authentication.py"))
     return auth.main(request, response)
diff --git a/test/wpt/tests/xhr/resources/auth2/corsenabled.py b/test/wpt/tests/xhr/resources/auth2/corsenabled.py
index bec6687dbe9..7b9d3b65aba 100644
--- a/test/wpt/tests/xhr/resources/auth2/corsenabled.py
+++ b/test/wpt/tests/xhr/resources/auth2/corsenabled.py
@@ -1,8 +1,9 @@
-import imp
 import os
 
 from wptserve.utils import isomorphic_decode
 
+from tools.wpt.utils import load_source
+
 here = os.path.dirname(isomorphic_decode(__file__))
 
 def main(request, response):
@@ -11,7 +12,7 @@ def main(request, response):
     response.headers.set(b'Access-Control-Allow-Methods', b'GET')
     response.headers.set(b'Access-Control-Allow-Headers', b'authorization, x-user, x-pass')
     response.headers.set(b'Access-Control-Expose-Headers', b'x-challenge, xhr-user, ses-user')
-    auth = imp.load_source(u"", os.path.abspath(os.path.join(here, os.pardir, u"authentication.py")))
+    auth = load_source(u"", os.path.abspath(os.path.join(here, os.pardir, u"authentication.py")))
     if request.method == u"OPTIONS":
         return b""
     else:
diff --git a/test/wpt/tests/xhr/resources/auth3/auth.py b/test/wpt/tests/xhr/resources/auth3/auth.py
index db4f7bc4c9f..3797aaa52e9 100644
--- a/test/wpt/tests/xhr/resources/auth3/auth.py
+++ b/test/wpt/tests/xhr/resources/auth3/auth.py
@@ -1,12 +1,13 @@
-import imp
 import os
 
 from wptserve.utils import isomorphic_decode
 
+from tools.wpt.utils import load_source
+
 here = os.path.dirname(os.path.abspath(isomorphic_decode(__file__)))
 
 def main(request, response):
-    auth = imp.load_source(u"", os.path.join(here,
+    auth = load_source(u"", os.path.join(here,
                                              u"..",
                                              u"authentication.py"))
     return auth.main(request, response)
diff --git a/test/wpt/tests/xhr/resources/auth4/auth.py b/test/wpt/tests/xhr/resources/auth4/auth.py
index db4f7bc4c9f..3797aaa52e9 100644
--- a/test/wpt/tests/xhr/resources/auth4/auth.py
+++ b/test/wpt/tests/xhr/resources/auth4/auth.py
@@ -1,12 +1,13 @@
-import imp
 import os
 
 from wptserve.utils import isomorphic_decode
 
+from tools.wpt.utils import load_source
+
 here = os.path.dirname(os.path.abspath(isomorphic_decode(__file__)))
 
 def main(request, response):
-    auth = imp.load_source(u"", os.path.join(here,
+    auth = load_source(u"", os.path.join(here,
                                              u"..",
                                              u"authentication.py"))
     return auth.main(request, response)
diff --git a/test/wpt/tests/xhr/resources/auth7/corsenabled.py b/test/wpt/tests/xhr/resources/auth7/corsenabled.py
index 7a060627b70..c82ba4e6bc4 100644
--- a/test/wpt/tests/xhr/resources/auth7/corsenabled.py
+++ b/test/wpt/tests/xhr/resources/auth7/corsenabled.py
@@ -1,8 +1,9 @@
-import imp
 import os
 
 from wptserve.utils import isomorphic_decode
 
+from tools.wpt.utils import load_source
+
 here = os.path.dirname(isomorphic_decode(__file__))
 
 def main(request, response):
@@ -11,7 +12,7 @@ def main(request, response):
     response.headers.set(b'Access-Control-Allow-Methods', b'GET')
     response.headers.set(b'Access-Control-Allow-Headers', b'authorization, x-user, x-pass')
     response.headers.set(b'Access-Control-Expose-Headers', b'x-challenge, xhr-user, ses-user')
-    auth = imp.load_source(u"", os.path.join(here,
+    auth = load_source(u"", os.path.join(here,
                                              os.pardir,
                                              u"authentication.py"))
     if request.method == u"OPTIONS":
diff --git a/test/wpt/tests/xhr/resources/auth8/corsenabled-no-authorize.py b/test/wpt/tests/xhr/resources/auth8/corsenabled-no-authorize.py
index af8e7c4c170..4fdf99e2658 100644
--- a/test/wpt/tests/xhr/resources/auth8/corsenabled-no-authorize.py
+++ b/test/wpt/tests/xhr/resources/auth8/corsenabled-no-authorize.py
@@ -1,8 +1,9 @@
-import imp
 import os
 
 from wptserve.utils import isomorphic_decode
 
+from tools.wpt.utils import load_source
+
 here = os.path.dirname(isomorphic_decode(__file__))
 
 def main(request, response):
@@ -11,7 +12,7 @@ def main(request, response):
     response.headers.set(b'Access-Control-Allow-Methods', b'GET')
     response.headers.set(b'Access-Control-Allow-Headers', b'x-user, x-pass')
     response.headers.set(b'Access-Control-Expose-Headers', b'x-challenge, xhr-user, ses-user')
-    auth = imp.load_source(u"", os.path.join(here,
+    auth = load_source(u"", os.path.join(here,
                                              os.pardir,
                                              u"authentication.py"))
     if request.method == u"OPTIONS":
diff --git a/test/wpt/tests/xhr/resources/auth9/auth.py b/test/wpt/tests/xhr/resources/auth9/auth.py
index db4f7bc4c9f..3797aaa52e9 100644
--- a/test/wpt/tests/xhr/resources/auth9/auth.py
+++ b/test/wpt/tests/xhr/resources/auth9/auth.py
@@ -1,12 +1,13 @@
-import imp
 import os
 
 from wptserve.utils import isomorphic_decode
 
+from tools.wpt.utils import load_source
+
 here = os.path.dirname(os.path.abspath(isomorphic_decode(__file__)))
 
 def main(request, response):
-    auth = imp.load_source(u"", os.path.join(here,
+    auth = load_source(u"", os.path.join(here,
                                              u"..",
                                              u"authentication.py"))
     return auth.main(request, response)
diff --git a/test/wpt/tests/xhr/responsexml-document-properties.htm b/test/wpt/tests/xhr/responsexml-document-properties.htm
index a9f14f8212a..1d2811bec7d 100644
--- a/test/wpt/tests/xhr/responsexml-document-properties.htm
+++ b/test/wpt/tests/xhr/responsexml-document-properties.htm
@@ -4,11 +4,11 @@
     <title>XMLHttpRequest: responseXML document properties</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
+    <script src="../html/dom/documents/resource-metadata-management/support/document-lastModified-utils.js"></script>
   </head>
   <body>
     <div id="log"></div>
     <script>
-      var timePreXHR = Math.floor(new Date().getTime(new Date().getTime() - 3000) / 1000); // three seconds ago, in case there's clock drift
       var client = new XMLHttpRequest()
       client.open("GET", "resources/well-formed.xml", false)
       client.send(null)
@@ -87,10 +87,7 @@
       }, "Test document URL properties of document with <base> after redirect");
 
       test(function() {
-        var lastModified = Math.floor(parseLastModified(client.responseXML.lastModified).getTime() / 1000);
-        var now = Math.floor(new Date().getTime(new Date().getTime() + 3000) / 1000); // three seconds from now, in case there's clock drift
-        assert_greater_than_equal(lastModified, timePreXHR);
-        assert_less_than_equal(lastModified, now);
+        assert_document_lastmodified_string_approximately_now(client.responseXML.lastModified);
       }, 'lastModified set to time of response if no HTTP header provided')
 
       test(function() {
diff --git a/test/wpt/tests/xhr/send-redirect.htm b/test/wpt/tests/xhr/send-redirect.htm
index 16b3231e25b..7d73f0f64cc 100644
--- a/test/wpt/tests/xhr/send-redirect.htm
+++ b/test/wpt/tests/xhr/send-redirect.htm
@@ -9,28 +9,37 @@
   <body>
     <div id="log"></div>
     <script>
+      // https://fetch.spec.whatwg.org/#statuses
+      var redirect_codes = new Set([301, 302, 303, 307, 308]);
       function redirect(code) {
-        var test = async_test(document.title + " (" + code + ")")
+        var test = async_test(`${document.title} (${code} does ${redirect_codes.has(code)? "redirect": "not redirect"})`);
         test.step(function() {
-          var client = new XMLHttpRequest()
+          var client = new XMLHttpRequest();
           client.onreadystatechange = function() {
             test.step(function() {
               if(client.readyState == 4) {
-                assert_equals(client.getResponseHeader("x-request-method"), "GET")
-                assert_equals(client.getResponseHeader("x-request-content-type"), "application/x-pony")
-                test.done()
+                if (redirect_codes.has(code)) {
+                  assert_equals(client.getResponseHeader("x-request-method"), "GET");
+                  assert_equals(client.getResponseHeader("x-request-content-type"), "application/x-pony");
+                  assert_equals(client.status, 200);
+                } else {
+                  assert_equals(client.getResponseHeader("x-request-method"), null);
+                  assert_equals(client.getResponseHeader("x-request-content-type"), null);
+                  assert_equals(client.status, code);
+                }
+                test.done();
               }
             })
           }
-          client.open("GET", "resources/redirect.py?location=content.py&code=" + code)
-          client.setRequestHeader("Content-Type", "application/x-pony")
-          client.send(null)
+          client.open("GET", "resources/redirect.py?location=content.py&code=" + code);
+          client.setRequestHeader("Content-Type", "application/x-pony");
+          client.send(null);
         })
       }
-      redirect("301")
-      redirect("302")
-      redirect("303")
-      redirect("307")
+
+      for (var number of [300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 350, 399]) {
+        redirect(number);
+      }
     </script>
   </body>
 </html>

From b2d5e654b150605fbd18c0b45506c6333d250588 Mon Sep 17 00:00:00 2001
From: Khafra <maitken033380023@gmail.com>
Date: Thu, 30 Nov 2023 23:29:00 -0500
Subject: [PATCH 2/7] fix some test failures for others!!

---
 lib/fetch/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/fetch/index.js b/lib/fetch/index.js
index 253ad51394c..cf76fc91e10 100644
--- a/lib/fetch/index.js
+++ b/lib/fetch/index.js
@@ -1109,7 +1109,8 @@ function fetchFinale (fetchParams, response) {
     })
 
     // 4. Set internalResponse’s body’s stream to the result of internalResponse’s body’s stream piped through transformStream.
-    internalResponse.body.stream = internalResponse.body.stream.pipeThrough(transformStream)
+    internalResponse.body.stream.pipeThrough(transformStream)
+    internalResponse.body.stream = transformStream.readable
   }
 }
 

From 6a25b4a8ca87299b1205a24a063b4257165c494d Mon Sep 17 00:00:00 2001
From: Khafra <maitken033380023@gmail.com>
Date: Thu, 30 Nov 2023 23:29:24 -0500
Subject: [PATCH 3/7] fix some test failures for others!!

---
 lib/fetch/util.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/fetch/util.js b/lib/fetch/util.js
index 6d0412e48b8..0c7260669da 100644
--- a/lib/fetch/util.js
+++ b/lib/fetch/util.js
@@ -1054,7 +1054,7 @@ function simpleRangeHeaderValue (value, allowWhitespace) {
   }
 
   // 5. If the code point at position within data is not U+003D (=), then return failure.
-  if (data.charCodeAt(position.position) != 0x3D) {
+  if (data.charCodeAt(position.position) !== 0x3D) {
     return 'failure'
   }
 
@@ -1098,7 +1098,7 @@ function simpleRangeHeaderValue (value, allowWhitespace) {
   }
 
   // 11. If the code point at position within data is not U+002D (-), then return failure.
-  if (data.charCodeAt(position.position) != 0x2D) {
+  if (data.charCodeAt(position.position) !== 0x2D) {
     return 'failure'
   }
 

From 214785ade832c6ae911e888e9af1dc58396423ba Mon Sep 17 00:00:00 2001
From: Khafra <maitken033380023@gmail.com>
Date: Fri, 1 Dec 2023 13:34:47 -0500
Subject: [PATCH 4/7] fix most remaining failures

---
 lib/fetch/body.js                 | 15 +++++++++++----
 lib/fetch/index.js                |  5 ++++-
 lib/fetch/util.js                 |  3 ++-
 test/wpt/server/server.mjs        |  1 +
 test/wpt/status/fetch.status.json |  4 ++++
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/lib/fetch/body.js b/lib/fetch/body.js
index 19e5a8a2658..58da2941a85 100644
--- a/lib/fetch/body.js
+++ b/lib/fetch/body.js
@@ -50,9 +50,12 @@ function extractBody (object, keepalive = false) {
     //    up stream with byte reading support.
     stream = new ReadableStream({
       async pull (controller) {
-        controller.enqueue(
-          typeof source === 'string' ? textEncoder.encode(source) : source
-        )
+        const buffer = typeof source === 'string' ? textEncoder.encode(source) : source
+
+        if (buffer.byteLength) {
+          controller.enqueue(buffer)
+        }
+
         queueMicrotask(() => readableStreamClose(controller))
       },
       start () {},
@@ -223,13 +226,17 @@ function extractBody (object, keepalive = false) {
           // When running action is done, close stream.
           queueMicrotask(() => {
             controller.close()
+            controller.byobRequest?.respond(0)
           })
         } else {
           // Whenever one or more bytes are available and stream is not errored,
           // enqueue a Uint8Array wrapping an ArrayBuffer containing the available
           // bytes into stream.
           if (!isErrored(stream)) {
-            controller.enqueue(new Uint8Array(value))
+            const buffer = new Uint8Array(value)
+            if (buffer.byteLength) {
+              controller.enqueue(buffer)
+            }
           }
         }
         return controller.desiredSize > 0
diff --git a/lib/fetch/index.js b/lib/fetch/index.js
index cf76fc91e10..da193c93ee0 100644
--- a/lib/fetch/index.js
+++ b/lib/fetch/index.js
@@ -2009,7 +2009,10 @@ async function httpNetworkFetch (
 
       // 7. Enqueue a Uint8Array wrapping an ArrayBuffer containing bytes
       // into stream.
-      fetchParams.controller.controller.enqueue(new Uint8Array(bytes))
+      const buffer = new Uint8Array(bytes)
+      if (buffer.byteLength) {
+        fetchParams.controller.controller.enqueue(buffer)
+      }
 
       // 8. If stream is errored, then terminate the ongoing fetch.
       if (isErrored(stream)) {
diff --git a/lib/fetch/util.js b/lib/fetch/util.js
index 0c7260669da..e0426be3bcd 100644
--- a/lib/fetch/util.js
+++ b/lib/fetch/util.js
@@ -928,9 +928,10 @@ function isomorphicDecode (input) {
 function readableStreamClose (controller) {
   try {
     controller.close()
+    controller.byobRequest?.respond(0)
   } catch (err) {
     // TODO: add comment explaining why this error occurs.
-    if (!err.message.includes('Controller is already closed')) {
+    if (!err.message.includes('Controller is already closed') && !err.message.includes('ReadableStream is already closed')) {
       throw err
     }
   }
diff --git a/test/wpt/server/server.mjs b/test/wpt/server/server.mjs
index 82b9080f407..d12b4936978 100644
--- a/test/wpt/server/server.mjs
+++ b/test/wpt/server/server.mjs
@@ -36,6 +36,7 @@ const server = createServer(async (req, res) => {
       res.setHeader('content-type', 'text/html')
       // fall through
     }
+    case '/fetch/content-encoding/resources/big.text.gz':
     case '/service-workers/cache-storage/resources/simple.txt':
     case '/fetch/content-encoding/resources/foo.octetstream.gz':
     case '/fetch/content-encoding/resources/foo.text.gz':
diff --git a/test/wpt/status/fetch.status.json b/test/wpt/status/fetch.status.json
index 1796ee9cd89..34f91ed8375 100644
--- a/test/wpt/status/fetch.status.json
+++ b/test/wpt/status/fetch.status.json
@@ -232,6 +232,10 @@
         "note": "document is not defined",
         "skip": true
       },
+      "redirect-keepalive.https.any.js": {
+        "note": "document is not defined",
+        "skip": true
+      },
       "redirect-location-escape.tentative.any.js": {
         "note": "TODO(@KhafraDev): crashes runner",
         "skip": true

From 1ef8cfc913189a6e2fb0bb57bd3890981385f15e Mon Sep 17 00:00:00 2001
From: Khafra <maitken033380023@gmail.com>
Date: Fri, 1 Dec 2023 13:42:21 -0500
Subject: [PATCH 5/7] fix remaining WPT fail

---
 lib/fetch/index.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/lib/fetch/index.js b/lib/fetch/index.js
index da193c93ee0..8495ecabde8 100644
--- a/lib/fetch/index.js
+++ b/lib/fetch/index.js
@@ -1110,7 +1110,27 @@ function fetchFinale (fetchParams, response) {
 
     // 4. Set internalResponse’s body’s stream to the result of internalResponse’s body’s stream piped through transformStream.
     internalResponse.body.stream.pipeThrough(transformStream)
-    internalResponse.body.stream = transformStream.readable
+
+    const byteStream = new ReadableStream({
+      readableStream: transformStream.readable,
+      async start (controller) {
+        const reader = this.readableStream.getReader()
+
+        while (true) {
+          const { done, value } = await reader.read()
+
+          if (done) {
+            queueMicrotask(() => readableStreamClose(controller))
+            break
+          }
+
+          controller.enqueue(value)
+        }
+      },
+      type: 'bytes'
+    })
+
+    internalResponse.body.stream = byteStream
   }
 }
 

From b5dcb40b3ba0366d9f96493911ecd3bcc702acc3 Mon Sep 17 00:00:00 2001
From: Khafra <maitken033380023@gmail.com>
Date: Fri, 1 Dec 2023 13:55:33 -0500
Subject: [PATCH 6/7] fix fetching blob

---
 lib/fetch/response.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/fetch/response.js b/lib/fetch/response.js
index 73386123e33..c97951065be 100644
--- a/lib/fetch/response.js
+++ b/lib/fetch/response.js
@@ -335,10 +335,10 @@ function makeResponse (init) {
     cacheState: '',
     statusText: '',
     ...init,
-    headersList: init.headersList
-      ? new HeadersList(init.headersList)
+    headersList: init?.headersList
+      ? new HeadersList(init?.headersList)
       : new HeadersList(),
-    urlList: init.urlList ? [...init.urlList] : []
+    urlList: init?.urlList ? [...init.urlList] : []
   }
 }
 

From a4c9af35f65988803e4a71b4318867b43fa73aea Mon Sep 17 00:00:00 2001
From: Khafra <maitken033380023@gmail.com>
Date: Fri, 1 Dec 2023 14:20:50 -0500
Subject: [PATCH 7/7] mark websocket WPTs as failing

---
 lib/websocket/connection.js            |  1 +
 lib/websocket/util.js                  |  1 +
 test/wpt/status/websockets.status.json | 12 ++++++++++++
 3 files changed, 14 insertions(+)

diff --git a/lib/websocket/connection.js b/lib/websocket/connection.js
index e0fa69726b4..4bc60b3b90b 100644
--- a/lib/websocket/connection.js
+++ b/lib/websocket/connection.js
@@ -261,6 +261,7 @@ function onSocketClose () {
   //    attribute initialized to the result of applying UTF-8
   //    decode without BOM to the WebSocket connection close
   //    reason.
+  // TODO: process.nextTick
   fireEvent('close', ws, CloseEvent, {
     wasClean, code, reason
   })
diff --git a/lib/websocket/util.js b/lib/websocket/util.js
index 6c59b2c2380..d15a63cde92 100644
--- a/lib/websocket/util.js
+++ b/lib/websocket/util.js
@@ -182,6 +182,7 @@ function failWebsocketConnection (ws, reason) {
   }
 
   if (reason) {
+    // TODO: process.nextTick
     fireEvent('error', ws, ErrorEvent, {
       error: new Error(reason)
     })
diff --git a/test/wpt/status/websockets.status.json b/test/wpt/status/websockets.status.json
index 68bc6e2ebe7..9f5a6308a1d 100644
--- a/test/wpt/status/websockets.status.json
+++ b/test/wpt/status/websockets.status.json
@@ -4,6 +4,18 @@
       "skip": true
     }
   },
+  "interfaces": {
+    "WebSocket": {
+      "close": {
+        "close-connecting-async.any.js": {
+          "note": "TODO - need to add route for handshake delay",
+          "fail": [
+            "close event should be fired asynchronously when WebSocket is connecting"
+          ]
+        }
+      }
+    }
+  },
   "Create-blocked-port.any.js": {
     "note": "TODO(@KhafraDev): investigate failure",
     "fail": [